[gentoo-commits] proj/mysql:master commit in: dev-db/percona-server/, dev-db/mysql/, eclass/, dev-db/mariadb/

[Brian Evans]

commit:     5e1cb44dc2ad719cd394c24927bd7cb801c9eb95
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 17:37:01 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 17:37:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=5e1cb44d

Fix tests and documentation related to new eclass

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mariadb/mariadb-10.1.9-r1.ebuild               |  9 +--------
 dev-db/mysql/mysql-5.6.28.ebuild                      | 13 +++----------
 ...r1.ebuild => percona-server-5.6.27.75.0-r1.ebuild} | 13 +++----------
 eclass/mysql-multilib-r1.eclass                       | 19 ++++++++++++++++---
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
index 6fbdc74..5a48322 100644
--- a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
@@ -137,13 +137,6 @@ multilib_src_test() {
 		retstatus_unit=$?
 		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
 
-		# 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-r1_disable_test main.perror "String mismatch due to not building local perror"
-		fi
-
 		# Ensure that parallel runs don't die
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 		# Enable parallel testing, auto will try to detect number of cores
@@ -174,7 +167,7 @@ multilib_src_test() {
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help plugins.cracklib_password_check \
 			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests

diff --git a/dev-db/mysql/mysql-5.6.28.ebuild b/dev-db/mysql/mysql-5.6.28.ebuild
index c41c878..ee4c1e8 100644
--- a/dev-db/mysql/mysql-5.6.28.ebuild
+++ b/dev-db/mysql/mysql-5.6.28.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-MY_EXTRAS_VER="20150717-1707Z"
+MY_EXTRAS_VER="20151105-2051Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 HAS_TOOLS_PATCH="1"
@@ -74,13 +74,6 @@ multilib_src_test() {
 		retstatus_unit=$?
 		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
 
-		# 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
-
 		# Ensure that parallel runs don't die
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 		# Enable parallel testing, auto will try to detect number of cores
@@ -130,13 +123,13 @@ multilib_src_test() {
 			rpl.rpl_plugin_load \
 			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
 		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		if ! use extraengine ; then
 			# bug 401673, 530766
 			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
 			done
 		fi
 

diff --git a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild b/dev-db/percona-server/percona-server-5.6.27.75.0-r1.ebuild
similarity index 91%
rename from dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
rename to dev-db/percona-server/percona-server-5.6.27.75.0-r1.ebuild
index 5641679..05963ac 100644
--- a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.27.75.0-r1.ebuild
@@ -3,10 +3,10 @@
 # $Id$
 
 EAPI="5"
-MY_EXTRAS_VER="20150717-1707Z"
+MY_EXTRAS_VER="20151105-2051Z"
 SUBSLOT="18"
 PYTHON_COMPAT=( python2_7 )
-inherit toolchain-funcs python-any-r1 mysql-multilib-r1
+inherit python-any-r1 mysql-multilib-r1
 
 IUSE="pam tokudb tokudb-backup-plugin"
 
@@ -96,13 +96,6 @@ multilib_src_test() {
 		# 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 Percona 5.6 for now and are believed to be
 		# false positives:
 		#
@@ -138,7 +131,7 @@ multilib_src_test() {
 			engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
 			engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
 			main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 72dcd68..0cd841a 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -26,6 +26,18 @@ MYSQL_EXTRAS=""
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
 
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES
+# @DESCRIPTION:
+# An array of extra CMake arguments for native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES
+# @DESCRIPTION:
+# An array of extra CMake arguments for non-native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES
+# @DESCRIPTION:
+# An array of CMake arguments added to native and non-native
+
 inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql_fx versionator \
 	multilib prefix toolchain-funcs user cmake-utils multilib-minimal
 
@@ -498,7 +510,7 @@ multilib_src_compile() {
 }
 
 
-# @FUNCTION: mysql-multilib_src_install
+# @FUNCTION: mysql-multilib-r1_src_install
 # @DESCRIPTION:
 # Install mysql.
 mysql-multilib-r1_src_install() {
@@ -609,8 +621,9 @@ multilib_src_install() {
 	fi
 }
 
-# @FUNCTION: mysql-multilib_pkg_preinst
+# @FUNCTION: mysql-multilib-r1_pkg_preinst
 # @DESCRIPTION:
+# Warn about ABI changes when switching providers
 mysql-multilib-r1_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -727,7 +740,7 @@ mysql-multilib-r1_getoptval() {
 	"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
 }
 
-# @FUNCTION: mysql-multilib_pkg_config
+# @FUNCTION: mysql-multilib-r1_pkg_config
 # @DESCRIPTION:
 # Configure mysql environment.
 mysql-multilib-r1_pkg_config() {