3 files changed, 156 insertions, 9 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index cfc2da7cfb18..80fb8d6b7799 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.688 2014/08/28 14:06:54 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.689 2014/08/30 00:53:55 grknight Exp $
+
+*mysql-5.6.20-r1 (30 Aug 2014)
+
+  30 Aug 2014; Brian Evans <grknight@gentoo.org> +mysql-5.6.20-r1.ebuild:
+  Revision bump to enable multilib
 
   28 Aug 2014;  <grknight@gentoo.org> -files/mysql-5.5.32-Werror.patch,
   files/my.cnf-5.5:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 67b790cef4d2..d6084490ff5c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -15,18 +15,19 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae
 EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a
 EBUILD mysql-5.1.73-r1.ebuild 8892 SHA256 a3f57db069a9d7eab793820178c0367ddeb912b604560db3a55553c9787cf230 SHA512 ebf6f4f196362b7623c6ee9b336e23ca94a67a32da4f389e4f49c9f44c1dc2b1c6e482de90e3afe1cfbf1edbcfbba02331ea4506cc5bc66fc2fed2624b9defd8 WHIRLPOOL c917e39875832571fdcdd5c37c58548c4bc25434b313b0dcbe569d0551b265ec3d2cf1811fbcbbac62213faa1de4855284769a2add53dc889e6998e76464e736
 EBUILD mysql-5.5.39.ebuild 4615 SHA256 f44dd9ebc5bfee7073fdef344903bb0fad67a411e52841506ea4c9ff515f45ad SHA512 a7fee9a6955b2f42d7206dc244b45e5b97dd3f936fdb664b0a55a38de1b221bfe998f30d23ebfa5445e839cf1026ee27fa0acde1c34b3d41be78963a00c35c0d WHIRLPOOL 6e57229545d685ed60a837d0c90e6706e8b7f28ba594479fea9e59a2c4d27a7ec1d7e6123d441563e7218872d9d571adc0e8857801e9f07ca77636c81e2f1794
+EBUILD mysql-5.6.20-r1.ebuild 4914 SHA256 a70fec415472a4c9bb5cbaa3efbda8e9f10426ea637f6e74506aee0086e6a0f6 SHA512 3925f899d4e0543e4f94235a6e62da577d715d5301958ad73fa2423876a5134ef159b2e530db29dd51015345d310330661a665fded87e3982f94d36fcacb65f2 WHIRLPOOL c6bb47f17345e77dcd818a2f7a7934c53c42bb40c6a042dcf649cdf41e30a2e8072d1fd2e6f19e7ab5bd232c74a701fc8271015ac2a655110b09d568a714e045
 EBUILD mysql-5.6.20.ebuild 4870 SHA256 3f648054cc738d223de0049f263040d9dd8fa0c57dba91059897cf8320686543 SHA512 841dde413652326c55c32581b4b94703f598e259e148b50767f2bff3c317650d757e4377c9e051e1ed324df01b6360916df9a84e1d39dd57a2d4e060baed55e1 WHIRLPOOL 88274cfd5530cc204304715e71b58503895655b6b201028d517cb89341a78fb3624c1b30cbf5db73ca18126ce1089db654c1950214416e4a397d34d3fabd41e6
-MISC ChangeLog 19599 SHA256 e8b98d3af29200007525ae007eea2040656a6298720718f72e097838c42c84dd SHA512 e23e30cd3ffa1fa511619129919eb978164a413ace1779bdd2642a04295f6644c9c44815097f684cbf0a3be5c22fb9dc19c23ffdcd420cd6640607960aa281bb WHIRLPOOL 2691ba549aee8e0dbd87bea52516116d5c51ccb0a75208c2166206b2cec2245fbdee799acbddeb6befac1e89ab048d21a8da2b0af07089741053ede8f1d362aa
+MISC ChangeLog 19741 SHA256 c58174e44db56ecf0685dd3169cd66cf512ead71fef6fc688d8c0c717a0c58f9 SHA512 6d8d31b2dd278019726bde5c71d94a2f77d80412a6b3c7cfeff9f19340193c790cb8ce12435efd9e724acd5bfbd47a1d1e26892fa3008be8331124ad92648f29 WHIRLPOOL f7083a3da8979975ba9c8b537d159779519c59b07a9701e6473169cc1033dc4ec52880c74ae70da7d10c22ccb102010a6714e32fbb6de6116f6a6f0e3e4e7ca3
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1440 SHA256 57b1430c744bb21c4f99b885b92c1ca27efec6757e06f51bc043e25737a226b5 SHA512 0a8f4cc67b3dee66b95c16edcb0c1dd70b95b199f7cd46ba4b509a9f52dbb7d45ed2da4280ed8ba93d96521f66fc80d486de91f0a23ff3e0baee48795e5151fa WHIRLPOOL d747dccd7d8ae91fd60c5c074a3d1f0ab64a96f8ec09658a36e42546d17cbd9644de45527ed1bc6babeb7329c666ecc01cea7283dc4640268ed5cd2ca045172b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT/zeFAAoJEE4V4vFnx44dzmoH/04jvOw1EDPmveFZvm9FtAYZ
-ZYnxeuwKENjMYSVPtfHan5mfiCKsXsoLl0fFSRhWkGOAGQ3U2YuENFAb8ZauSnKT
-gSWd3uwxOwW7MeWVpdBnthDGugsnhBMp8kDCCJo0/lN8pM851kSp+g4k77Lemoly
-4b7K3T1c4EiO07IbAp3199lsgIa0214/RbIPvPvgcDftX8NVhuYWhJWje7u4GMSM
-iNHTCEJ2uVchB7U5fxYZ3Btz5UzHTMDC5cr4wQS5lwD0ipoJOufPErQFFF1VkSgs
-V2nCYSQaNVhb4+7xd7XO9ASTRJnsBSyQth8Yt+24XHkU1X8B8Wl/NKwMm8GuEr0=
-=+LLA
+iQEcBAEBCAAGBQJUASCtAAoJEE4V4vFnx44d6dYH/A4/4edXJO/0ur8s+AyIZ8bN
+WwfMYfoQAcB5yxWcS68fpwGmJfwZ8zNQZ3anuSqc0bjZBw8sYvj6doc+XlYSVvWV
+eSEz32lwZe8/SKtqDsg6TNiCQk959Wpe1uIHzdRgXJD1Uit4ZXqr8ukSMmEe1Xsi
+KEdMzzr48Vcc7Kuz95xWbqN6Owt7tp8tmEapPfqrymJlRNBV0kzkHEpyhDNU6dpu
+Ssf0KXacanOOTOsi9piH2eVcKpkDYZf78Dis+qrLfxQSgws2fYZndhSX2flwJyPE
+QhSBYcgG/hyODSnoYYUgpwKfc+dtnl2S3/a+/xDcC1uQJ9Nn7BZvcHwOMB+1GME=
+=CjD3
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.6.20-r1.ebuild b/dev-db/mysql/mysql-5.6.20-r1.ebuild
new file mode 100644
index 000000000000..23d3d2e290ad
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.20-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.20-r1.ebuild,v 1.1 2014/08/30 00:53:55 grknight Exp $
+
+EAPI="5"
+
+MY_EXTRAS_VER="20140801-1950Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# 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
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwinfuncs_1.is_triggers \
+			mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+		; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--suite-timeout=5000
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}