Version bump of MySQL finally.

Package-Manager: portage-2.1.5.2

3 files changed, 114 insertions, 2 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index cd85465ed824..4eb739434ecb 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.449 2008/03/10 02:58:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.450 2008/05/29 05:51:04 robbat2 Exp $
+
+*mysql-5.0.60 (29 May 2008)
+
+  29 May 2008; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.0.60.ebuild:
+  Version bump of MySQL finally.
 
   10 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.27-r1.ebuild,
   mysql-4.1.22-r1.ebuild, mysql-4.1.23_alpha20070101-r61.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index c3943d6ae060..dd8e6b475c66 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -15,6 +15,7 @@ DIST mysql-5.0.42.tar.gz 24255814 RMD160 a0c5e5615423aa75ba8ad52c6dfb36d31bbc4fc
 DIST mysql-5.0.44.tar.gz 24388270 RMD160 7b380cf13d040149e5f0e75b582124ec996e0b03 SHA1 4603befa939613c74d6b3736ac39a8436edc58ea SHA256 e3cd455da52769cc7c80845992dedc9092745fcf3ea4d4929ae4181418805973
 DIST mysql-5.0.54.tar.gz 27397332 RMD160 50898b7339cad1339cfdcf01e75c8e851d837d80 SHA1 8b540ccce64a1c4cf470d4f78c8d811ebad8da1d SHA256 d3431038e594c6e6b480d2d7a24bca7166bb5e593c9d807140257ed06b105a66
 DIST mysql-5.0.56.tar.gz 27648999 RMD160 319d29e0ad85555b807ef4288e51002c6dfce82b SHA1 56e72a4b95ec38d304e902e21785944ccce85b59 SHA256 cff6e258d70c65deaaebca3f7cffd22fd27c06852e08d804f2af2197dbbd79f5
+DIST mysql-5.0.60.tar.gz 27918671 RMD160 3d7d35e585f96d0729a38146cdb6fdf7308f87bb SHA1 fc8477bb7e5737f7da8d6bc07fa468b18c3a7f7b SHA256 cd94b44413701d34449b1be649f3268625fd16df47b962c7204300d5b259ec73
 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
@@ -24,6 +25,7 @@ DIST mysql-extras-20070710.tar.bz2 52626 RMD160 e0f39f1fd35012fb3e2a431379d7b153
 DIST mysql-extras-20071115.tar.bz2 56027 RMD160 5e57e4a81c5874f2a4bb0c685d52d8bd9dabdcfb SHA1 25e60c8ad6b7708f9bb5b0dbe37edbd0f180ad2c SHA256 ec97e9147028448dc6d057744e80d2fd242b06796db8b19b9181d5f8acaafe7f
 DIST mysql-extras-20080124.tar.bz2 106526 RMD160 8f9f556308c96c4cd5cffd0506c99ea59e7c25c2 SHA1 574f5dbf4a8bb53d352cb2fbe391ad5c484eb932 SHA256 c4b33dd391834252d20d4b083ac4bd6999253a8f20d894dd93b0795c6b318829
 DIST mysql-extras-20080310.tar.bz2 106499 RMD160 ddc48002d0b5d0d03d1b88dbf037757a3aa38994 SHA1 c5584a0ff7121722c9e9359e1fdcc8744a2d215c SHA256 4b963976b26607827e61187a72589eefefe84bc811da37f7bfa07779bdb61b59
+DIST mysql-extras-20080529.tar.bz2 106586 RMD160 588c3ea358b0378523c44852476c37b88820c294 SHA1 9c5f4c840f070eed8c1979dedfabc593904718ab SHA256 8936d759d12502b2fe1a3539fd93eeb22e2e9ce5fa26f4d67b80995b24b23975
 EBUILD mysql-3.23.58-r1.ebuild 7397 RMD160 85c2f6ae75b4d4dc6bb4c3228e4e800a9b20bbdd SHA1 b532250266fb20af81b4b6b9b56d47de048789ce SHA256 9250045fb9af28896c2f266c8c9b33409b525f1481b2ba70d104ec9ba5b4a6d8
 EBUILD mysql-4.0.27-r1.ebuild 1035 RMD160 6c3d710119acd6423f36434eb1265ea29af9582c SHA1 06e0833f06029e6cf1dc91d4faac30442e896c98 SHA256 dc73877d6d542253e588b34f92d380f150cf8f32d3ec4b67ce621b99193bcb58
 EBUILD mysql-4.1.22-r1.ebuild 1267 RMD160 53937bcb2a3092b55287c97230295fb7ddfaa544 SHA1 e1a7eb1e18a5ff878626ad75cc5777883d4b7a08 SHA256 56e4ef73cfb22659dcedbfe4c8834a8b5e0423fd19eb75d9733c9abcf99b9e85
@@ -39,5 +41,6 @@ EBUILD mysql-5.0.44-r2.ebuild 2136 RMD160 08988870156ad6df2519b4444613876a67b167
 EBUILD mysql-5.0.44.ebuild 2421 RMD160 818b644ac5d77a7b103263f4c4763edd11dbbd06 SHA1 523b445bf93c05313d702d7ebfe6e5c9deab55f1 SHA256 43f1119475c02fa856a6b038c9c7318cce5adce8ed4514485b98088db7fa423a
 EBUILD mysql-5.0.54.ebuild 2234 RMD160 21f1250f7898539c647da3c2c891fd783e028f42 SHA1 102973bff40df2682c8aa2c08d04967b77151273 SHA256 05408eff3c300abcea774727f926b75205f233986250edb350178ff30da16f9f
 EBUILD mysql-5.0.56.ebuild 3271 RMD160 7b9984700de0c8decded65b810d18adcf206ff81 SHA1 1a58b1099f6dddfd05c772c224d5ff7174ec606e SHA256 85aa87df23f96430a61f4526c7dc0a5a6f02c65b5839185ddbe0e1b1bcaf075f
-MISC ChangeLog 86752 RMD160 9894aac4ff5643a25bc4b8e0c643d76b5627c582 SHA1 87b5f7648ee45302b7f963400620b494d3fe5d28 SHA256 9edb6e04f17a8bb0697ab9943fa9938189e22a9220099ac7611cea1c5590c76e
+EBUILD mysql-5.0.60.ebuild 3271 RMD160 4d06ba35c46e56edc9c3ee9d117c0cb202cfbc88 SHA1 ec90463c94c15bbe571ffa9dcda920274541bb5f SHA256 976ce8cd46aa6692d44b19bff5f651c24904d8a9ce47afb30fada62ee9b93d93
+MISC ChangeLog 86890 RMD160 1f176c9245cb32287eef6ebd27f131e93530705b SHA1 53a30c211e8cb28039cf9ea92a9287238ff72cb9 SHA256 64157308ba100269b22b3d647fdd0ee4af023b5684e7dee9748d0a50005886e7
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
diff --git a/dev-db/mysql/mysql-5.0.60.ebuild b/dev-db/mysql/mysql-5.0.60.ebuild
new file mode 100644
index 000000000000..6ba044e9f753
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.60.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.60.ebuild,v 1.1 2008/05/29 05:51:04 robbat2 Exp $
+
+MY_EXTRAS_VER="20080529"
+SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz"
+
+inherit toolchain-funcs mysql
+
+# 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=''
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+src_test() {
+	make check || die "make check failed"
+	if ! use "minimal" ; then
+		if ! hasq "userpriv" ${FEATURES} ; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream"
+		fi
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus1
+		local retstatus2
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.44|5.0.45|5.0.46|5.0.48|5.0.5[0-6]*)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.44-56 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus1=$?
+		[[ $retstatus1 -eq 0 ]] || eerror "test-ns failed"
+
+		make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		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"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}