Revision bump to fix bug 537872

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

3 files changed, 176 insertions, 16 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index e64d0c4a66b3..c27a2c1ae852 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.718 2015/01/25 10:19:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.719 2015/01/28 19:44:29 grknight Exp $
+
+*mysql-5.6.22-r1 (28 Jan 2015)
+
+  28 Jan 2015; Brian Evans <grknight@gentoo.org> +mysql-5.6.22-r1.ebuild:
+  Revision bump to fix bug 537872
 
   25 Jan 2015; Agostino Sarubbo <ago@gentoo.org> mysql-5.6.22.ebuild:
   Stable for sparc, wrt bug #525296
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 2c74ad16260e..d0848706ba40 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -11,27 +11,29 @@ DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb0
 DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
 DIST mysql-extras-20141019-1948Z.tar.bz2 1494569 SHA256 9a2ced701ef613e2a41c9a1fc550d9004d04f52cbfc06bb634ba9284d7a1c0ea SHA512 c9e3f3a447f010be0563b9d9ee2937d32c5334b04a883218eb6c14af41f9de635c3c0c44128959793e8a12ca3b26b2415777a13aced7c3812ab2c6d21ade6799 WHIRLPOOL bc0c73ca86d59d18a76a047a920fc2f64d2b3246e6b64838127d26c5c55cb3fc1ce8833656f5eadba72ef651e1f6c3e75700f776a1205ab33ab6ee0064851b86
 DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9f02d06e1262748847be45a9aeaaa841f7ed4b4dc SHA512 958b410d7905d7911a69288ba9a9ebb1d80ff38281506e18400652b15895eb3926d9679fd245a54f4f7cdb688ed9940f21b1b4634239dbc1a1db19ac3918921a WHIRLPOOL baf70684826f393723bd3877813d9415c15b847ffd71757535a12106bff4fcf343cca37e166d45be06eca0425d249dc600bc752ab5e27e02ead3897952ceb169
+DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 EBUILD mysql-5.5.40.ebuild 4073 SHA256 b995be1a0cf508a87e12225ae6168f91a0f4098ce24aa4d61e00f4ae1d735519 SHA512 4c6eb3f253a0769421d1c0f4c88081251c7f0159f7d58a60ce9a7f4132405ab897f8dfbdb19ae4584c87df955d109abc17f884cc97a674dcb835f01b181f9841 WHIRLPOOL 8420b841f89f25eac7cf4300de2918e1372ca76f40e55acbee3a55f0a1bc367cd1b946767033ddd97803ff33ddf6db4055b85d1e347b9dcccda070bfd6f95193
 EBUILD mysql-5.5.41.ebuild 4071 SHA256 ae8165b249af56c676522c5fecdb259108e08fde3bee78da082d3d965c66429a SHA512 e2603665081ce6afc48aa192a50f0c318069ab8f90ab0e90b807e7ae29c1fcfb0d852a01bc4da2f77c01308fb18bdb632bbfcf950962749c36a021be2c862b6c WHIRLPOOL cee7a7f8ced60c89c68b91a2c7b1700d22f8fbb3ee7f7f737bde34f9758c56e0cc4ad1f28db6985381a2468df96f229b2d228aeadadfa9ef8bb09546034ea6d8
 EBUILD mysql-5.6.21-r1.ebuild 4828 SHA256 8fe5739aa873d1bd6475bfbfd5cd036e9509ea96c373667df351ec0021f82ef6 SHA512 c3ad6f344ba695535257b4da711ddada022490eb0ebe717ccdae4e23fbf27211a65745cb0db9df60bd103bbde7e8089f5ccd0b63ffd73c1d12c66ec10f2e28e5 WHIRLPOOL 5e682fdf50352614fdadf015a3618bcf679e30a530b449e53ff691d16efd3ae4508fe1244f25c91a13e3ea0eae90ad44f16e66c78e550a988c95d4c04d1a126f
+EBUILD mysql-5.6.22-r1.ebuild 5257 SHA256 459f73bd679b830b42d1aa00da31f15c17c438cba4000ac670c34c0fba1ad9c3 SHA512 e25607b5e12ff09389c38d8a927bb9bf0687387dec635450020609311e8e1d187ad0529d1574dc72c45c5f118dfe65a663cde39676d5a7436204d4740c8bf48f WHIRLPOOL dbd71819d83510f064c52f1b44c977d88a58233c3b6f9335cb3ea47ee89ca30ed7660e3f0a8f155c66350ccdf6c96d9959e24a2dcfab74be7be3893ca82c5216
 EBUILD mysql-5.6.22.ebuild 5242 SHA256 b1af0b4d976b26825401db48c1b4528b857d9b525771632a80cd375d5bd99a16 SHA512 cc3da39252fed23d1e3157e72da3e4c4796e9891e4e8940e9ef1ea0036e3b792b98a669a92ccfa9e315790606d0f6c557103302425ba8185d7a8001584651681 WHIRLPOOL 5539ebb6512a84e360e175f52eb3f47d75a81f6d28d47194825d0aa634ab06ac9aff3de75596e72fff4819e15f5d84ebab005072b3e43a0b0103cb1814d39e16
-MISC ChangeLog 23260 SHA256 a23e8f2ecc39cbe96d0a1cbe7eaa40ce025829001de5da28e4261e2cd0318395 SHA512 aa4868e9e4cb5327d9daf12b3d1c4aa553674d00227f844e6af2b024a9902368c01e39e7218d1a0c8c6d88de52f04abbcb591440a2d5d540b94068a7345700f6 WHIRLPOOL 6b3b0eedbacdd075ce4b4eef3aae51a9f7eb8f0dc77237f4efd1d46658c96fb4ecf64135c9add708bf3d658ff97fd2e1fb609aa6715683597ecac33e6e834f26
+MISC ChangeLog 23406 SHA256 5188e585c82da397f06085ba79e3c6945bbf0c2e9f3e269a975feb8e15f2e95d SHA512 e3420d818a7fa565a3d017d1d90452db2a42a20db27fe7199f1836ab264053a2dfd39f76ce6dd2ccb37bc0777953f2eb19c39a3f307aebf6367fe3ad1da46afe WHIRLPOOL fb1286443cba280ca4b2c61cb893f6296a0c0ad89d62d6abb915980698b26f29995aaf98e92bfa4ad4aba3ea8ec7608777ca1f54f29d27ee13cba058045aa127
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1195 SHA256 de7dc626aa238322a90b982b1e2055d9f6b0b0fb4c72366a6ea79145626154c4 SHA512 236b205d90988ff622eccffec1d0811b1600115089b45dc1da457e707a3318330d2ce94d22fc92f0ce5555a806c82e95289ffe96fd440698fdf90936240373cf WHIRLPOOL f41e2b682bedbfec1d8389d60b352931339811d16012096f3856e76725a54488a36da6e8dcf108db9704a90fd9bb2b78c74d99c890c4619decf51063c7bf1fbf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUxMMdAAoJELp701BxlEWfoTsQALSl6s5yqosMk+7aN3soGcie
-9o45vVuRynD3p68ehBBOFMzkTKxRKx03sL3IzQJGU3Z/d3VGAh5tIUJW+OpRQmdz
-O5V3ar4/5H/9i7iI/+s3RbNKpHt4hYOzbitJlpMlTXa93X7s1aufIftvrGQGjlrM
-C+7+m0FHftB8idcqm6GDk36CXdS0ZHnZnff+2n/Ed4uJrupWpsqByNZYmllOF5Rn
-XjYLI3NVBGEr06xJ8rTVewlTFAXFJxUUCPmaAkNccs1jEjuOEszeq4oUlrr+lanO
-PNUeEtK6DxNI5GYTSiSqWVC7b29X/4taxsU3+rV6M6ZrdrzmKZDrFmeIJPCkUC5Z
-/JY7dMpHh/HteWLS+ewkJCLVTKdZ+uLJ7JCU0N2UTL3KuRvA1v1cqOtuwW6yVFLw
-6q4Onc42D8XM0N9JQnLvj1Jsxv4JsTV0QeX5h3AFq6sIZGJvCZ5rDH6lu3f1EVTP
-/wjpJL9szHT6C3jROAnUUIpIDLPUe7rZKwKb1UunKiTClxZYqdbDVgO+zkmy1Tlq
-ls/TY2LNUXRI6gLxDe3nW528X+xClWxbSagbf3J0Stg0r3hsSRbyQh1+wVG5Bx/y
-pLJojN+DBFynuDjQQcBchYxleOxfnxCumskLJyUKLbNmhfCHjU1OfJN5IZ+OvrbM
-8rDvkYUn2Ohywjsl6wTZ
-=TEYJ
+iQIcBAEBCAAGBQJUyTwiAAoJENH3ge/59KO2EycQAIwfImb75ZgNTVBEMRPv/UQS
+uq1gaiPXhDNta3uxOY+E1IqyoWKmul3lCdQwieCHJQNnuDN6BHHctZNH7l49r52F
+dQ/+7DWZcE4T8NE2lDrQVKIKllm4g9hHnbWtiJPfDFx42Dkdnp+A1z/xeuUSetl1
+blk3aOBAilOf4nLAcSQKOm9OLKNwUfrz2GTKKQ6SC2iHIJ4F4J/ZuC1DraGov5Oc
+NDP7Wl1xWzEf/8T44uGZf+Oz/wFCIqAz9A2Wj+ZoXsT+t4DWzcoTTStGpUe85FVN
+oOj2KJPTu1DObU1E5A8/K1TkNWbuX0TS7qAA2dmr3TsMYjDj8G0Ce4k08i5RVuWj
+i+gI6dtRRjOK6DbBe4j9CDN238v+8TjBuz39TROf9inxj+b04To74yNRwILUFVf8
+AhqRiuu5g6bX/bsKFnE04qsSIHs2fzWvAaBVe90bHrk7w812z53xwaHZyHwbGWfj
+wlMHFIVL3WZPkQIZUvLR7g1nZJhq7yFKs8kzxF8dX/aDNozkAs6sT7DFgyvPEfEd
+gMIuxnrrrWjG9TP0mR2cs/84t//G7KhYSmb2OuEUBpKBPvqy1Vkqrhl6LkVJZK1D
+Xj7TCxLXEYBtZMgNgWCESSoS8AwxTV6is4C+qTHbmM5GyEOvfkDDNaK6fvV+zVnj
+eeMy2g2sYekwu2gBH0DW
+=Los9
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.6.22-r1.ebuild b/dev-db/mysql/mysql-5.6.22-r1.ebuild
new file mode 100644
index 000000000000..395d41fa3315
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.22-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22-r1.ebuild,v 1.1 2015/01/28 19:44:29 grknight Exp $
+
+EAPI="5"
+
+MY_EXTRAS_VER="20150127-1351Z"
+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 ~mips ~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="${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 "${T}"/var-tests{,/log}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${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,
+		# 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
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+		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-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+		; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# 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="${T}/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
+}