Update to MySQL 5.0.26, fix init-script bug.

(Portage version: 2.1.2_pre2-r9)

4 files changed, 51 insertions, 3 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 42289ff21283..e743568c4fac 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.363 2006/10/10 21:21:30 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.364 2006/10/13 19:51:09 chtekk Exp $
+
+*mysql-5.0.26 (13 Oct 2006)
+
+  13 Oct 2006; Luca Longinotti <chtekk@gentoo.org> files/mysql.rc6,
+  +mysql-5.0.26.ebuild:
+  Update to MySQL 5.0.26, fix init-script bug.
 
   10 Oct 2006; Francesco Riosa <vivo@gentoo.org> mysql-5.0.24-r1.ebuild:
   Added patch, fix bug #150458
diff --git a/dev-db/mysql/files/digest-mysql-5.0.26 b/dev-db/mysql/files/digest-mysql-5.0.26
new file mode 100644
index 000000000000..b472382aabbc
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.26
@@ -0,0 +1,6 @@
+MD5 63ec8afeaf202c435b12d112f5ce7857 mysql-5.0.26.tar.gz 25986952
+RMD160 98ee85457de4bc8c8f8acddc8b6f0dc7687f32c7 mysql-5.0.26.tar.gz 25986952
+SHA256 4266fe6a3593700d4157b8cc4278fa8ae98837d4757735fc6ed70d9df6bb2680 mysql-5.0.26.tar.gz 25986952
+MD5 6af974d4a10e2f228c05b33096ba3cb0 mysql-patchset-5.0.26-r1.tar.bz2 1127
+RMD160 d4fe6cd98d68efd4dd54a7f60accaa691e1eb01b mysql-patchset-5.0.26-r1.tar.bz2 1127
+SHA256 3f581b2eea3e849c8cc7381c58b420f4da3847e2a21205c9ba21376a9efd9d02 mysql-patchset-5.0.26-r1.tar.bz2 1127
diff --git a/dev-db/mysql/files/mysql.rc6 b/dev-db/mysql/files/mysql.rc6
index e300d4f9a024..d18d5a6b3aa5 100644
--- a/dev-db/mysql/files/mysql.rc6
+++ b/dev-db/mysql/files/mysql.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.rc6,v 1.4 2006/08/28 12:22:21 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.rc6,v 1.5 2006/10/13 19:51:09 chtekk Exp $
 
 # external binaries used: which, sed, tac
 
@@ -234,7 +234,7 @@ start() {
 	local ssd_thing=1
 	local mysqld_thing tmpnice
 
-	ebegin
+	ebegin "Starting ${myservice}"
 	# try to start each server
 	for srv in ${serverlist[*]} ; do
 
diff --git a/dev-db/mysql/mysql-5.0.26.ebuild b/dev-db/mysql/mysql-5.0.26.ebuild
new file mode 100644
index 000000000000..e7028304fb04
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.26.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.26.ebuild,v 1.1 2006/10/13 19:51:09 chtekk Exp $
+
+# Leave this empty
+MYSQL_VERSION_ID=""
+MYSQL_RERELEASE=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="1"
+
+inherit mysql
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+src_test() {
+	cd "${S}"
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq "minimal" ; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		cd mysql-test
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# Just to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}