commit:     2497d1c29c57ac61489257d248347953a952f777
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 19:58:24 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 19:58:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=2497d1c2

dev-db/mariadb-galera: Version bump

Package-Manager: portage-2.2.25
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mariadb-galera/ChangeLog                    |   5 +
 dev-db/mariadb-galera/Manifest                     |  29 ++---
 .../mariadb-galera/mariadb-galera-10.0.22.ebuild   | 136 +++++++++++++++++++++
 3 files changed, 156 insertions(+), 14 deletions(-)

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
index def3db6..b624d07 100644
--- a/dev-db/mariadb-galera/ChangeLog
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -1,3 +1,8 @@
+*mariadb-galera-10.0.22 (19 Nov 2015)
+
+  19 Nov 2015; Brian Evans <[email protected]> 
+mariadb-galera-10.0.22.ebuild:
+  dev-db/mariadb-galera: Version bump
+
 *mariadb-galera-10.0.21 (19 Aug 2015)
 
   19 Aug 2015; Brian Evans <[email protected]> 
+mariadb-galera-10.0.21.ebuild,

diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 667cd9c..b220004 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -3,24 +3,25 @@ Hash: SHA256
 
 DIST mariadb-galera-10.0.20.tar.gz 56558895 SHA256 
f6b979cbae803d1b33e85407fcd2aaf19b07fb5e183726666e8c990f1f7d5ce8 SHA512 
dbae146c798d08f624fcdac86d7f69aea2ebe8540f659004fee11dba4a0a6c234b7235544ae4adf3b58add989649533f86dbe1de4107eb7bbd433add42f55dad
 WHIRLPOOL 
93ad52daae91463772a163a59beab57496102fc2cd23ba7f9b009875ea8cb7b854d8a0d857ddb90d6e3ec3e034ae8403eb7aedba55f9d2a97f72dbc999085f69
 DIST mariadb-galera-10.0.21.tar.gz 56518164 SHA256 
dc5385603257980ac2549a2c142e7eb41ab2bf60f9ca47ddfc1f6138b5138b58 SHA512 
46d007b48a6f03bf5242d771d96a07ebf3f35af9c32d74bed37fb1d72b493d66db2007ec134be7e9d9aca5b2ccb968049a347fb1cfd86d8cc2da1408ff32b5dc
 WHIRLPOOL 
a3d5b118a1fe11fc07727ace130cb8766d47b1ae49926ec95fcf79e80250286286ccc02cb8f8c78ec63bcb0556d2f559cbaab0ff62bf721bdd27a49d219da981
+DIST mariadb-galera-10.0.22.tar.gz 56593286 SHA256 
03707fe86add4ed3a1039d1c2d2a1eca768feef15bf8499d6a61bdeb0802de9e SHA512 
4dd508293235fc786f1d3ada37b20284f591e16c50aea06514de3d5310f01ef22d01c8345226395ddccc0ee8c96b952a6e7b17f94b248cb6977bf40fff7c117f
 WHIRLPOOL 
612f8910a9549aab4e77f1580570500fc4591d6f034728be55c2af8cd861e1170289c82db622cb34116aa0131c2ba89b32290fff5e863c96693ed1825eeaf070
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 
4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 
7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed
 WHIRLPOOL 
99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 
d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 
3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9
 WHIRLPOOL 
11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJV1LbCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJWTincXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2Wv8P/iVF9zTpgNHcL3kVYVmaIxdV
-v8yq89Uxwptwi2dz4NQClHxWD7VCGoclNFvH6Y4sxe7VBqHA2nhnGmxgZlUAegNv
-Utuw0XSlacP/Fw49oFuCDnF6MzG0k7DLEcVv1aG+/kXc/wODeAUoxXT5qwQ7i1bO
-O2zH0X0tW30O7Da93VSCUM+iWD+oA5jNTfDD8/HWEOui+jaddW6fIbRGdPFOc7oM
-/DiBqp8mV8mboUnmUq9bSDnu4gNwJ7yLr0XY7+KJDyv5ko7S+v4EwWqvFEatJReq
-mmT+1vjs4hEjpIExNwT5uMY1HwHI7kH/nUWUhGDR/hCJL6BfXrLtVSBlJL22KPhl
-G0oZ5ZTqdbO3yS6lLz2Cw2Zcb0oaK3IqgzdivvUcyubfjDygpXzZWrklCKXq/rYa
-dmAUE3uJj3ElELF3NNzc+48uXhUyfamlJzWFqq+Fu2lqx8RvSfN7WhXwNnSfZxjA
-igsYUleKVac4QkpAi59H0G9F5PkZcittOwV/l6sOJzEbRZh3Lwj6PBqqzndwDw3Z
-GXYpxkUXw1jFYFHBSTprxTNmVF/9JKrgIKLo0FnfCX35ba8xdQsbJ2OdVNH6nUNg
-qmebX6FmYolVsVueVlwy2ine7FW4+yV1qmF1oFEEbevb08Z+zbl+Eqnr8TARmnI9
-kISoULqtA7ATuL0IJZPD
-=R8QN
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2l0UQANNPNAoaPrkrijruG16dl/TH
+M0nKh7ecazk3lD3wakQr2hBM/YW+4TP4wEQiEet8wHO2r1bOYmqB5wLabEIDZ9GH
+RiQ7liBnZP93TpcNi3610LLqFNpQZITbVzZXKelYyBqyndozOh0yQWaUm6jRtepk
+NTT/QnRxQ0XhpOoPlzmABft5DvAni4h/jgLyqkzR/xtRYN3RyIAG06oJjhEjk3WD
+Mq2W7vteU1fnjeTtlvNmQxa6f35d2K0Tqu76DagbaZCXQhgJpF8xoibqxl8Eyjvs
+Whdrcs3JAUoOurc0hfS90Q66ihHKxS9YQVXRg8rTterYRWae5S2yimbnQKrO+9GE
+xP9h/HXO6GzOKM55G0gxj/FGaceK6WOoc/WeAidqfsv+XQszAn9zuv75XH/8xk9X
+j0HgUU3jEUTewUd6AQjbS2j9FqFLFCREjcEd0CqDk9XqyNIQFHJe5A/dKYR8is4Q
+FRhzIomG5a4p8dsOxeJkjHLtoSScGtC9Sw9Oy6XUkfyerNg1evmZXryKcGwbL/KW
+JIIeO7TELpJTER3//xdoUC6xeMszsXVfDgGA4q8SYH5Uan/QuuliRST7x8LtsDdg
+JJyqXByAUUr3gMqi5OvF4vU5X/TC3G64W8gZAF459h3D+Y8NTbIbRvKVbQRMXE21
+HvUjIofqXzstJyX1r5Wm
+=ztmJ
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild 
b/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild
new file mode 100644
index 0000000..a420f7b
--- /dev/null
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20150717-1707Z"
+WSREP_REVISION="25"
+HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
+
+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="~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='client-libs embedded extraengine perl server openssl static-libs tools' 
\
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-galera-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 server ; 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 a symlink to provided binaries so the tests can find 
them when client-libs is off
+               if ! use client-libs ; then
+                       ln -srf /usr/bin/my_print_defaults 
"${BUILD_DIR}/client/my_print_defaults" || die
+                       ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || 
die
+                       mysql-multilib_disable_test main.perror "String 
mismatch due to not building local perror"
+               fi
+
+               # 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, main.bootstrap
+               # fails due to USE=-latin1 / utf8 default
+               #
+               # main.mysql_client_test, main.mysql_client_test_nonblock
+               # main.mysql_client_test_comp:
+               # segfaults at random under Portage only, suspect resource 
limits.
+               #
+               # 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 main.bootstrap \
+                       binlog.binlog_statement_insert_delayed 
main.information_schema \
+                       main.mysqld--help wsrep.variables wsrep.foreign_key \
+                       funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
+                               mysql-multilib_disable_test  "$t" "False 
positives in Gentoo"
+               done
+
+               # Run mysql tests
+               pushd "${TESTDIR}"
+
+               # run mysql-test tests
+               # The PATH addition is required for the galera suite to find 
the sst scripts
+               WSREP_LOG_DIR="${T}/var-tests/wsrep" \
+               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"
+
+               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
+}

Reply via email to