[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/

["Brian Evans" <grknight@lavabit.com>]

commit:     7b47bc0e91515b1f7d2498bdea833447adbef5a3
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Oct 14 17:45:37 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Oct 14 17:45:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7b47bc0e

[mysql] Version bump for 5.5 and 5.6 series
5.5.34 fails test rpl.rpl_deadlock_innodb same as bug 473002
5.6.14 fails test rpl.rpl.rpl_spec_variables in a simliar manner to bug 473002

---
 dev-db/mysql/Manifest            |   2 +
 dev-db/mysql/mysql-5.5.34.ebuild | 129 +++++++++++++++++++++++++++++++++++++++
 dev-db/mysql/mysql-5.6.14.ebuild | 119 ++++++++++++++++++++++++++++++++++++
 3 files changed, 250 insertions(+)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d7450d6..ae24250 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,9 +4,11 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
 DIST mysql-5.5.33.tar.gz 24680463 SHA256 6ad9af38de1f3595c5fb81bc24bdb62fa39b2ce1c690d87ac7d7a21ca71fceba SHA512 c0d24249113abe5c61a47c96938b49db715d1daf2c27aedbead1b6a69b2cb6c1dd5a96412055182a28d3703ffa808c6032dc2ad608abbcec850f1fc80c552b39 WHIRLPOOL 964974a93a718010cf1c6631b9d0c7c483e66271caeca0b986ae564656fb5cf1e172d15631729ecb02fb07f9bc5e1d491855c23fa4ef4a0af4dcce363b5079f2
+DIST mysql-5.5.34.tar.gz 24699724 SHA256 b0602b492d519602b7fa8e4cc87df998d9794fbc955819beec586a268fe06485 SHA512 dc2ea7e8a7fa0f2124f53d1c23d39a183b1b641069356baff6900fa7a03770c44bb924effd957f33f511fc28c4aa3913b8abc550d8104d54604bf1841b426144 WHIRLPOOL 91bc26610771c550707cb7f1f088a0a5503d95eea449701a5abbc12a98f3e5b02a47686eb15929b7981e4495f4561618abb749db03bdefbe3be98e8d9fdcb4ac
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
 DIST mysql-5.6.13.tar.gz 35951160 SHA256 5d1b230c3ce896fbea47a69b14b9efb122621a19f32c1102d388d8e7fa442d7e SHA512 56d3aa84c0ed69fcdb7706117398d555aaec0c20fe09364cd6d4a6b3e3af8644825d7cb886dbfd3fe630bfd318306090359f04f2558cf499915a9f1648520a82 WHIRLPOOL e9c701b8923071136e3baaabffae5f38e76ae7f8cf237aa0109614940a365bf2589d05d2c31b1523a92ad4ad0cc7dbff4eb15711b09c0cb3223e73e88456b290
+DIST mysql-5.6.14.tar.gz 36005278 SHA256 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7 SHA512 655e88d9150d32b10b3fad360d36d7ff94c670be9dd1378cef4b9c8ea5c38d74e61eaacd9dbaf3d1aad743c11a2ccc1173b6e1f15d93af866884ef867895f141 WHIRLPOOL d3c2c79da1f3817fe5a0f3d83ba6c40741e73294a82cf8bab38db16755d2379aad7d4c3280c8927d5c391f5fc3f50a399cffce5027685413cec48616e569ba82
 DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551

diff --git a/dev-db/mysql/mysql-5.5.34.ebuild b/dev-db/mysql/mysql-5.5.34.ebuild
new file mode 100644
index 0000000..c8ba059
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.34.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20130602-1946Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# 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-linux"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}

diff --git a/dev-db/mysql/mysql-5.6.14.ebuild b/dev-db/mysql/mysql-5.6.14.ebuild
new file mode 100644
index 0000000..ddba830
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.14.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# 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-linux"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}