commit: acf607db1577dd97c89bd97af490bf166064f887
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 28 18:00:53 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 18:00:53 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=acf607db
Version bump; clean up metadata
---
dev-db/mariadb-galera/Manifest | 6 +--
...0.0.12.ebuild => mariadb-galera-10.0.15.ebuild} | 47 +++++++++++++---------
dev-db/mariadb-galera/metadata.xml | 1 -
3 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 386361a..5f816d2 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,4 +1,4 @@
-DIST mariadb-galera-10.0.12.tar.gz 51307785 SHA256
e68d6ec7c99e0c361a1d2e986e4adb2436776de8192e39dc9ea08ef24e13b1ef SHA512
8c6a39d3a81a7ea795a1c55e527c85996b4dc227607722e94d3c13051e19109bb9873b9993279407064f1d9dc0d1585234af5d22d9d1940fc05b856076249504
WHIRLPOOL
2d2a2720a5b5289902254549b06dd4cbb1476ad76b6bb2bef2fbd7ae57cb8490a47a0b260507ff93ef5aa647a270d2de48f0fb7a3a9ef8dcfea059734362db7d
DIST mariadb-galera-10.0.14.tar.gz 51396249 SHA256
ce5a20df0cea64cd1efb2cbe29f91842e56d47266a550e79d87dc96f50bff769 SHA512
6e617b0050eb52f14631c9751b4d4fea699b4eca6ef33a8397fe5076f029ca7c516c6915264a175cecd735651b540ae37bc5d3214a2da6e24d8430a969b5ea45
WHIRLPOOL
6807e32ac5e6423eb216f45d9dbf5829837880ace0f96e09a6dc760c7dcd9e169744197019f879c08a661ec11ae8269d57f5063bec33b648aabdba87e4fbf2de
-DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256
28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512
d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c
WHIRLPOOL
531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
-DIST mysql-extras-20140924-1913Z.tar.bz2 1494659 SHA256
958114bbe5fe21220f27b478c67a9ad3edd8d88fc58b528c6e7b5cf20e46dabb SHA512
b5fc435804b5843ecb9e522dbc8c6b5d2bb9bc8a7c39633032aaf566f2a2488fc6c0017a92dd6db95db6c14d06d25c43a67fb2387818a0060611c3c811491037
WHIRLPOOL
a6a3b1953180923882de75d2e15cdbbf29f42c90947c88e1b29ceee3a2d8094eb5ee015ce2f38b13dbb84d52120be9e867618c90b655ffeec10d32947ce625d0
+DIST mariadb-galera-10.0.15.tar.gz 55753400 SHA256
aea257ce0834d2c0e34e76966afecda0349995c2f6df0dbeec01f3e81ce5e0bb SHA512
e8a3addb7b6dcda8d3984d3cad17b478df70c67ce356e007385953bbd17d717cbc874713ac0066570e5b3154459666991d6f69bc80deeedff219d3efa9bac1ea
WHIRLPOOL
c7453899591da3a68e51a24d17283bfe2334f87db6a0e1e25313f5bade1bf5986227e21aeff086be291d55d4533d1e69556c3630048fca346cf3fa6ee864d71a
+DIST mysql-extras-20141019-1948Z.tar.bz2 1494569 SHA256
9a2ced701ef613e2a41c9a1fc550d9004d04f52cbfc06bb634ba9284d7a1c0ea SHA512
c9e3f3a447f010be0563b9d9ee2937d32c5334b04a883218eb6c14af41f9de635c3c0c44128959793e8a12ca3b26b2415777a13aced7c3812ab2c6d21ade6799
WHIRLPOOL
bc0c73ca86d59d18a76a047a920fc2f64d2b3246e6b64838127d26c5c55cb3fc1ce8833656f5eadba72ef651e1f6c3e75700f776a1205ab33ab6ee0064851b86
+DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256
4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512
7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed
WHIRLPOOL
99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
b/dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild
similarity index 74%
rename from dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
rename to dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild
index 69e1e8f..c2db7bb 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild,v
1.2 2014/10/02 02:33:56 grknight Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild,v
1.1 2014/12/16 02:02:07 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20140729-2200Z"
+MY_EXTRAS_VER="20141215-0144Z"
WSREP_REVISION="25"
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
+inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
@@ -31,7 +28,12 @@ RDEPEND="${RDEPEND}"
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-galera-X.X.XX.ebuild \
# digest clean package
-src_test() {
+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
@@ -58,9 +60,12 @@ src_test() {
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+ # 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}
+ mkdir -p "${T}"/var-tests{,/log}
# These are failing in MariaDB 10.0 for now and are believed to
be
# false positives:
@@ -70,27 +75,32 @@ src_test() {
# funcs_1.is_columns_mysql
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # main.mysql_client_test, main.mysql_client_test_nonblock
+ # mina.mysql_client_test_comp:
# segfaults at random under Portage only, suspect resource
limits.
#
- # plugins.unix_socket
- # fails because portage strips out the USER enviornment variable
+ # wsrep.variables:
+ # Expects the sys-cluster/galera library to be installed and
configured
+ #
+ # wsrep.foreign_key:
+ # Issues a configuration deprecation warning which does not
affect data
#
for t in main.mysql_client_test main.mysql_client_test_nonblock
\
+ main.mysql_client_test_comp \
binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help plugins.unix_socket \
+ main.mysqld--help wsrep.variables wsrep.foreign_key \
funcs_1.is_triggers funcs_1.is_tables_mysql
funcs_1.is_columns_mysql ; do
- mysql-v2_disable_test "$t" "False positives in
Gentoo"
+ mysql-multilib_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 --parallel=auto
+ # The PATH addition is required for the galera suite to find
the sst scripts
+ PATH="${BUILD_DIR}/scripts:${PATH}" \
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests"
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
@@ -108,9 +118,6 @@ src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
-
- # Cleanup data files after tests
- rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb-galera/metadata.xml
b/dev-db/mariadb-galera/metadata.xml
index 94a23ae..7c8bf6e 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -14,7 +14,6 @@ dev-db/mariadb
<flag name='extraengine'>Add support for alternative storage engines
(Archive, CSV, Blackhole, Federated(X), Partition)</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for
allocations.</flag>
<flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
- <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='profiling'>Add support for statement profiling (requires
USE=community).</flag>
