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

[Robin H. Johnson]

commit:     f230b877924f09450b48b32add26b9d0e94c78b6
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Wed Jul 30 06:31:48 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 30 06:32:02 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f230b877

mariadb-galera merge back from the tree. unsure if we should keep the 5.5 series for reference.

Package-Manager: portage-2.2.10

---
 dev-db/mariadb-galera/ChangeLog                    |   8 ++
 dev-db/mariadb-galera/Manifest                     |   4 +-
 .../mariadb-galera-10.0.10_beta.ebuild             | 115 ---------------------
 ...0.0.11.ebuild => mariadb-galera-10.0.12.ebuild} |   7 +-
 4 files changed, 14 insertions(+), 120 deletions(-)

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
index 03a68b4..6a5d572 100644
--- a/dev-db/mariadb-galera/ChangeLog
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -1,3 +1,11 @@
+*mariadb-galera-10.0.12 (30 Jul 2014)
+
+  30 Jul 2014; Robin H. Johnson <robbat2@g.o>
+  +mariadb-galera-10.0.12.ebuild, -mariadb-galera-10.0.10_beta.ebuild,
+  -mariadb-galera-10.0.11.ebuild:
+  mariadb-galera merge back from the tree. unsure if we should keep the 5.5
+  series for reference.
+
 *mariadb-galera-5.5.35 (14 Feb 2014)
 
   14 Feb 2014;  <grknight@g.o> +mariadb-galera-5.5.35.ebuild,

diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index de501a1..6c935d1 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,6 +1,6 @@
-DIST mariadb-galera-10.0.10.tar.gz 52124329 SHA256 f3120440a20d535798e08e2b4fd25f8bf05c7cc2d094c2bdf7384454354f4a96 SHA512 c99b3a9287b6b2ccacc6cfd9078bdc492f3c3e0a23963a07d2ff052ac3baf78e83283f73f771ce9d9ca32a600d440e3956005df047a332993b3c4942ce9e5e43 WHIRLPOOL e52aac77da09cde10288345b3b8fbc7e3a13fc0e26e7d63774aed04b8a79b8e9a7c0f3f2c4f1e2dfcb37984d9086a281a67ee2f8bb299d2186734700a1cad397
-DIST mariadb-galera-10.0.11.tar.gz 51267163 SHA256 0dcc91cb78d6bc28027469469de50fd0967123e9ec029fa37e957bb1120337fc SHA512 31627ca28bd76b448d83689f079e9249c21eca8d5ac9b8ad3326e29b9d9c44d4d74e115715d65e2eaa723c645fe9e768eebf789377e762f51286c2351884f26d WHIRLPOOL 80c2f1b730aa83754ea295004a66fabf795c293e1145581571614e1ae84103b6286c45876ce98fbb111d36ce36dc1aec6d1d5d6cba95567a1bf6bd88c346966b
+DIST mariadb-galera-10.0.12.tar.gz 51307785 SHA256 e68d6ec7c99e0c361a1d2e986e4adb2436776de8192e39dc9ea08ef24e13b1ef SHA512 8c6a39d3a81a7ea795a1c55e527c85996b4dc227607722e94d3c13051e19109bb9873b9993279407064f1d9dc0d1585234af5d22d9d1940fc05b856076249504 WHIRLPOOL 2d2a2720a5b5289902254549b06dd4cbb1476ad76b6bb2bef2fbd7ae57cb8490a47a0b260507ff93ef5aa647a270d2de48f0fb7a3a9ef8dcfea059734362db7d
 DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256 ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512 78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09 WHIRLPOOL fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
 DIST mariadb-galera-5.5.37.tar.gz 46241516 SHA256 3913849ffa754b55fedc4a9f625880dd8f25e4c5ce6e80594ac46a693494fae1 SHA512 e14dc38f2ca06d166af4a9752dac0fff2f56e674b7094704a169e7ddc1f34cff62fac3870d60743b02af45c7d8b55f7a9a981d55b8bc78269c9d88b02b4c34bc WHIRLPOOL 39dd4e053ce815e9123aece722800a9fc0cf53ba8896eb1c702b17923499bf1fe8409ae10edfafcc813b65f6ba46e0d4dfcfa4159416ffa1d2a49c9ca4ae96e5
 DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
 DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256 84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512 a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc WHIRLPOOL 241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
+DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11

diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild
deleted file mode 100644
index 187b7a4..0000000
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.10_beta.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20140424-1043Z"
-WSREP_REVISION="25"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# 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 mariadb-galera-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MariaDB 10.0 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help plugins.unix_socket \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		# Skip all CONNECT engine tests until upstream respondes to how to reference data files
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
-		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/mariadb-galera/mariadb-galera-10.0.11.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
similarity index 94%
rename from dev-db/mariadb-galera/mariadb-galera-10.0.11.ebuild
rename to dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
index 08f17c4..d323bb0 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.11.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild,v 1.1 2014/07/30 06:26:21 robbat2 Exp $
 
 EAPI="5"
-MY_EXTRAS_VER="20140424-1043Z"
+MY_EXTRAS_VER="20140729-2200Z"
 WSREP_REVISION="25"
 
 # Build system
@@ -89,7 +89,8 @@ src_test() {
 
 		# run mysql-test tests
 		# Skip all CONNECT engine tests until upstream respondes to how to reference data files
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" --skip-test=connect
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+				--skip-test=connect --parallel=auto
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"