Version bump for bug #184791. Includes patch for mysql_client_test per bug #160284, thanks to gabrielp@simnet.is.

Package-Manager: portage-2.1.3_rc5

4 files changed, 98 insertions, 15 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 4382113f974a..38d5da0b076c 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.418 2007/06/09 14:24:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.419 2007/07/11 09:52:36 robbat2 Exp $
+
+*mysql-5.0.44 (11 Jul 2007)
+
+  11 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.44.ebuild:
+  Version bump for bug #184791. Includes patch for mysql_client_test per bug
+  #160284, thanks to gabrielp@simnet.is.
 
   09 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org> mysql-5.0.42.ebuild:
   ppc stable, bug #178860
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index da8bf93d25af..75b0b290a431 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX my.cnf 1231 RMD160 21aad0c2aa4aecc5963043e5127c0648b4e4fa5c SHA1 febf824dfc1b1c76ffef10c165b5098430c2b2ca SHA256 303d5a4344c40246974e849a18c66508234961e7ba325cbc0f75777463283776
 MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
 RMD160 21aad0c2aa4aecc5963043e5127c0648b4e4fa5c files/my.cnf 1231
@@ -27,11 +24,13 @@ DIST mysql-5.0.34.tar.gz 23015439 RMD160 5294b76edb004162247e9e032929fe728887202
 DIST mysql-5.0.38.tar.gz 23307140 RMD160 7c69373e4c3de1d04b3494890d43ee61f49ce3de SHA1 be1ab0c73799a848194d3ab1c11cdbfa8d638018 SHA256 c8a4e746a1465b1768c356713b0e0b62818eb5132c8bb674747dabc5f37786c4
 DIST mysql-5.0.40.tar.gz 24045497 RMD160 85eb5a8a032d87f27a60ea1a025273742fe6a47b SHA1 94eef0eae2d6b3cf35dc71023662616cd787a251 SHA256 a370e44f7f233c80334cc875447c92e30bed94a6036917d4d44471ff85ebc55c
 DIST mysql-5.0.42.tar.gz 24255814 RMD160 a0c5e5615423aa75ba8ad52c6dfb36d31bbc4fc6 SHA1 035fe02c06112445dc3020214f3beb0335a3c4fe SHA256 29f80b85ec66b55d5f7340c23c400cf69c5a6ab8d7cf6ddc560776a56017928e
+DIST mysql-5.0.44.tar.gz 24388270 RMD160 7b380cf13d040149e5f0e75b582124ec996e0b03 SHA1 4603befa939613c74d6b3736ac39a8436edc58ea SHA256 e3cd455da52769cc7c80845992dedc9092745fcf3ea4d4929ae4181418805973
 DIST mysql-extras-20061210.tar.bz2 51115 RMD160 52355e608d5048c91b7960aa5be0c030ecb0e5d8 SHA1 c9d035ac73d29fe2d1274760ca70b8c6b882fec6 SHA256 46505a8b54ae7cafdc610465edfdfde1cd74f101071f71cf1f5c1c02e92790eb
 DIST mysql-extras-20070105.tar.bz2 50005 RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb SHA1 7f4dbc3d6c20fe953bf6e936a58343a229398ca0 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172
 DIST mysql-extras-20070108.tar.bz2 49996 RMD160 eb7459e2390c4d877f4c4d5cf9bb3d14c39c4212 SHA1 58f8db940a1e524ae1527e9efe9f2c2e1be4ef86 SHA256 55d46ac681036cda8f95d5f169d494cd3c6a25fbc7ec327a949518adf64a8ba8
 DIST mysql-extras-20070217.tar.bz2 50155 RMD160 fd8cb330772fcc77bc3ac501a899f8c704d0d798 SHA1 2ce58115db0f703d98c4f7b0c0b1835123c07386 SHA256 401a8fed36f87d81d53c5c392a017d85a3a27c1694e38350ba30d68732197ea0
 DIST mysql-extras-20070415.tar.bz2 51424 RMD160 8babddf636b175cc044cbc821ab64e62eedcb6ce SHA1 4654ef18cbc7171065dbfebe82abdf4227ad6c4c SHA256 cbaed8e7e35899417d3e265798f4f9ffd046af99f4032b38b114c36b6887a704
+DIST mysql-extras-20070710.tar.bz2 52626 RMD160 e0f39f1fd35012fb3e2a431379d7b15389e05187 SHA1 15b04104a61c61c216e85508b711e61855ba3ee4 SHA256 980a5fa500f4136e13bf434f167995248b9c8f96a2c42c96e4d7ad60246ad7fc
 EBUILD mysql-3.23.58-r1.ebuild 7351 RMD160 5c21410054f9adafde2e0461517c49133fdf93a5 SHA1 ff70a54090f43e8b55382b03e9988efd1c01336b SHA256 e39a0f934e7ac69e6bbab26b1cdeded4609431edd9f2a0e601d1e82c07edbcac
 MD5 9818ddcd09d9b4d4cbbec6d0a82f4d79 mysql-3.23.58-r1.ebuild 7351
 RMD160 5c21410054f9adafde2e0461517c49133fdf93a5 mysql-3.23.58-r1.ebuild 7351
@@ -72,10 +71,14 @@ EBUILD mysql-5.0.42.ebuild 2655 RMD160 c5316c19c9143f7f4918cab521a538825ff0648a
 MD5 ba4a6b2bd8a2e3dcb9201f127bdd9f45 mysql-5.0.42.ebuild 2655
 RMD160 c5316c19c9143f7f4918cab521a538825ff0648a mysql-5.0.42.ebuild 2655
 SHA256 76210b9f7692c65e6598497ee85112e8af37cf302c9c835cbd672671d9fc295e mysql-5.0.42.ebuild 2655
-MISC ChangeLog 82526 RMD160 a3e84b481e06bcda53819c657bc90313459d9408 SHA1 5be14ca0ebc64362be61e298c7e858b0b1effbff SHA256 078f5733c7cf6a6e26d40745b5778fe0cd626b01d1a45ea5624fa2eb86d19b59
-MD5 0bde3d698dc7f813cdd1317b607bfddd ChangeLog 82526
-RMD160 a3e84b481e06bcda53819c657bc90313459d9408 ChangeLog 82526
-SHA256 078f5733c7cf6a6e26d40745b5778fe0cd626b01d1a45ea5624fa2eb86d19b59 ChangeLog 82526
+EBUILD mysql-5.0.44.ebuild 2429 RMD160 b457842550204701952f41d1cf9f985750bc40fa SHA1 c814c5fd2e53fe2a18b2af303d0dbea0a1ce4d99 SHA256 a1857d16eba598d8fed11a58c530593b5c242ef20359da4af560ed8365f8a4ee
+MD5 1fac9f428b460376aa06af440f147865 mysql-5.0.44.ebuild 2429
+RMD160 b457842550204701952f41d1cf9f985750bc40fa mysql-5.0.44.ebuild 2429
+SHA256 a1857d16eba598d8fed11a58c530593b5c242ef20359da4af560ed8365f8a4ee mysql-5.0.44.ebuild 2429
+MISC ChangeLog 82746 RMD160 45bacf07066e82ff12ec960af52efe44ca0a86aa SHA1 1bba1d804dc3dd5c9b7bf2597dc6c94a83dff7c5 SHA256 8dd4d9e0999af7525e4036ac32b453620e559421491b46f9d04ea0f763636ece
+MD5 6720b36958971ee66da7bc26709bbcca ChangeLog 82746
+RMD160 45bacf07066e82ff12ec960af52efe44ca0a86aa ChangeLog 82746
+SHA256 8dd4d9e0999af7525e4036ac32b453620e559421491b46f9d04ea0f763636ece ChangeLog 82746
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
@@ -110,10 +113,6 @@ SHA256 bb8c5dc3e6ddb3141501cdd555768ae9c41e7f3dc38fbce0804eb4f94e171771 files/di
 MD5 1ed6dde2aa9dd69c9cd0ed0ab10f1288 files/digest-mysql-5.0.42 509
 RMD160 a91f4ac00a55c4cf6474743e3bcbb91034031d5a files/digest-mysql-5.0.42 509
 SHA256 07cb77dc6389e82ea588f1cc8bc178ae6a4771dd07a23b5b276d219b72d8bc4e files/digest-mysql-5.0.42 509
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGfuAgp/wUKkr7RBoRAoFPAKCUHRaDro5mlBvHDVXC+5/3Rb66mgCdGJjd
-UAMAJYFBUIRKToq6pTNJ2jY=
-=YAg2
------END PGP SIGNATURE-----
+MD5 50f096819d44691c990e35cd15e8f36d files/digest-mysql-5.0.44 509
+RMD160 21c16c25e2c6ed655b3cfebc96824f392dd0ae01 files/digest-mysql-5.0.44 509
+SHA256 956236bea4bccd166e701ff5ffc011c5d1e0d8bc9e730ecc8d0def41a042f1f3 files/digest-mysql-5.0.44 509
diff --git a/dev-db/mysql/files/digest-mysql-5.0.44 b/dev-db/mysql/files/digest-mysql-5.0.44
new file mode 100644
index 000000000000..8b7b41323415
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.44
@@ -0,0 +1,6 @@
+MD5 a6a557758bfb66557a1182db75b46b2f mysql-5.0.44.tar.gz 24388270
+RMD160 7b380cf13d040149e5f0e75b582124ec996e0b03 mysql-5.0.44.tar.gz 24388270
+SHA256 e3cd455da52769cc7c80845992dedc9092745fcf3ea4d4929ae4181418805973 mysql-5.0.44.tar.gz 24388270
+MD5 6619312d9ec44aba9ffbef530fc03cdc mysql-extras-20070710.tar.bz2 52626
+RMD160 e0f39f1fd35012fb3e2a431379d7b15389e05187 mysql-extras-20070710.tar.bz2 52626
+SHA256 980a5fa500f4136e13bf434f167995248b9c8f96a2c42c96e4d7ad60246ad7fc mysql-extras-20070710.tar.bz2 52626
diff --git a/dev-db/mysql/mysql-5.0.44.ebuild b/dev-db/mysql/mysql-5.0.44.ebuild
new file mode 100644
index 000000000000..d8c4f2da01be
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.44.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.44.ebuild,v 1.1 2007/07/11 09:52:36 robbat2 Exp $
+
+MY_EXTRAS_VER="20070710"
+SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
+
+inherit mysql toolchain-funcs
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+src_test() {
+	make check || die "make check failed"
+	if ! use "minimal" ; then
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus1
+		local retstatus2
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# mysqladmin start before dir creation
+		mkdir -p "${S}"/mysql-test/var{,/log}
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		if ! hasq "userpriv" ${FEATURES} ; then
+			# As of 5.0.38, these work with the sandbox
+			# but they break if you are root
+			for t in \
+			loaddata_autocom_ndb \
+			ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \
+			ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \
+			ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \
+			ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \
+			ndb_{restore,subquery,transaction,trigger,truncate,types,update} \
+			ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb \
+			mysql_upgrade
+			do
+				mysql_disable_test	"${t}"	"fails as root"
+			done
+		fi
+
+		[ "${PV}" == "5.0.42" ] && \
+			mysql_disable_test "archive_gis" "Broken in 5.0.42"
+		[ "${PV}" == "5.0.44" ] && \
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test "archive_gis" "Broken in 5.0.44 on big-endian boxes only"
+
+		# We run the test protocols seperately
+		make -j1 test-ns force=--force
+		retstatus1=$?
+		[[ $retstatus1 -eq 0 ]] || eerror "test-ns failed"
+
+		make -j1 test-ps force=--force
+		retstatus2=$?
+		[[ $retstatus2 -eq 0 ]] || eerror "test-ps failed"
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus1 -eq 0 ]] || die "test-ns failed"
+		[[ $retstatus2 -eq 0 ]] || die "test-ps failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}