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

[Brian Evans]

commit:     de3fd560585eac63dc5b37b1dba425e8e0218cfc
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Dec 23 17:59:40 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Dec 23 17:59:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=de3fd560

[mariadb-galera] Version bump

---
 dev-db/mariadb-galera/Manifest                     |   3 +-
 dev-db/mariadb-galera/mariadb-galera-5.5.29.ebuild | 129 ---------------------
 ...-5.5.32.ebuild => mariadb-galera-5.5.34.ebuild} |   5 +-
 dev-db/mariadb-galera/metadata.xml                 |   2 +-
 4 files changed, 6 insertions(+), 133 deletions(-)

diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index b00e699..44e2cfb 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,4 +1,3 @@
-DIST mariadb-galera-5.5.29.tar.gz 27954645 SHA256 3992ad32cd5324e588942fe8a123bde60fdbe0fa25bebb25baf1dba7c0228e4e SHA512 baa56caa00f20a102cb3803311839713ddda6443431ff399ea464968cde3de5a73ee34e1d04266136a6c026bcdcaf1523bcdd09b36ba9a7ff6bd7862eef0971c WHIRLPOOL e376d0d77851fd3581ab3fe5409a2bc222432acaa0c1a3dc291dd7f649a0a73687d5979a7d8fae094fb2d7c89866ccefbd7f524d4f198c440725680245d80345
-DIST mariadb-galera-5.5.32.tar.gz 28052682 SHA256 f1a9ced929e32659012f8d917e69f1b1087b08fc905a7cad53326bfd285526b2 SHA512 66bfd6ca587659b0fdceaa8f7c52c7bdea6e1db67e2dafa0ba58f79878113205eacf3aa717ff74c36a620aa431cb562f10d9305920f85c963596675c04a4bf43 WHIRLPOOL 7bfdf3770fb63245af4612ac58bbb5b19b582e63ad84750960b1b3da68deeb84116cedd0d145724d811b15da800aa11cf838287c82b13b591045f9c887637bba
 DIST mariadb-galera-5.5.33a.tar.gz 45358838 SHA256 1b49e41e677d95f7a5b548771a81c6430ec6f0ee16e7ee624fb2fe2b278183b8 SHA512 2106909b0a104848eb7c02c8a28d6904268a8a119dea17c37eef3c019f27b1f633a189570460990f86aaaad0bdeb7645ac921e1f0936c95d74a4599c194fd96b WHIRLPOOL 091201d8417dad8522739e4af2b36dbfad248d360ff54aaa2d89143ce377f89eea9e76828d8ce863ebd26af5753471610fd333d5a4e8eef290e248aec75ce4e5
+DIST mariadb-galera-5.5.34.tar.gz 45818386 SHA256 ae6ebdb8d0d200e05b9dadc3d4175632c698acb217267e533a685f846f557ad4 SHA512 78498e42f6def630e1b84a3dd948a3b4c590caf34db6a6a57b518cd178571e269393cff366c44ce30ea0cd6aee368dd904d42015fff1545147b41d1a946a2f09 WHIRLPOOL fffd50e3c6b0ad81f9f2ad8fddf7fe99bbc1e11e25850d36beba2a34446bdff67ac740ce6884d4185f71b866fbaab5fe61f6af482e3f739d46a242f0892f7e8a
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e

diff --git a/dev-db/mariadb-galera/mariadb-galera-5.5.29.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.29.ebuild
deleted file mode 100644
index a5f04af..0000000
--- a/dev-db/mariadb-galera/mariadb-galera-5.5.29.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
-WSREP_REVISION="23"
-
-# 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="~alpha ~amd64 ~arm ~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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-galera-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, 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.
-		#
-		# 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)
-		#
-		# 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 main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 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
-		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/mariadb-galera/mariadb-galera-5.5.32.ebuild b/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
similarity index 96%
rename from dev-db/mariadb-galera/mariadb-galera-5.5.32.ebuild
rename to dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
index 19d143f..c704fbb 100644
--- a/dev-db/mariadb-galera/mariadb-galera-5.5.32.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-5.5.34.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
+MY_EXTRAS_VER="live"
 WSREP_REVISION="23"
 
 # Build system
@@ -62,6 +62,9 @@ src_test() {
 		# 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 for now and are believed to be
 		# false positives:
 		#

diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
index 6a55540..59e6784 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -17,10 +17,10 @@ dev-db/mariadb
   <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
   <flag name='minimal'>Install client programs only, no server</flag>
   <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
-  <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
   <flag name='test'>Install upstream testsuites for end use.</flag>
+  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
 </use>
 </pkgmetadata>