summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2018-08-09 12:58:52 -0400
committerBrian Evans <grknight@gentoo.org>2018-08-09 12:58:52 -0400
commit59a8e4748b669c389241d118a54f23cc1c7a9e9c (patch)
tree205f65da08be96b50249bcd5feb26b4d425accfa
parentFix tests on 5.6 for clientlibs (diff)
downloadmysql-extras-20180809-1700Z.tar.gz
mysql-extras-20180809-1700Z.tar.bz2
mysql-extras-20180809-1700Z.zip
client-libs: Add options to execute my_print_defaults from libexecmysql-extras-20180809-1700Z
This is needed for the mariadb's addition of the --mysqld option used in galera sst and initial database setup
-rw-r--r--20018_all_mariadb-10.0.20-without-clientlibs-tools.patch16
-rw-r--r--20018_all_mariadb-10.1.16-without-clientlibs-tools.patch36
-rw-r--r--20018_all_mariadb-10.2.16-without-clientlibs-tools.patch36
-rw-r--r--20018_all_mariadb-5.5.60-without-clientlibs-tools.patch16
4 files changed, 104 insertions, 0 deletions
diff --git a/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch b/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch
index 8d3b41e..5d17863 100644
--- a/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch
@@ -112,3 +112,19 @@ diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
MERGE_LIBRARIES(libmysql SHARED ${LIBS}
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
COMPONENT SharedLibraries)
+diff -aurN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+--- a/scripts/mysql_install_db.sh 2018-08-04 18:20:58.000000000 -0400
++++ b/scripts/mysql_install_db.sh 2018-08-09 12:23:28.707894151 -0400
+@@ -280,10 +280,10 @@
+ print_defaults="$builddir/extra/my_print_defaults"
+ elif test -n "$basedir"
+ then
+- print_defaults=`find_in_dirs my_print_defaults $basedir/bin $basedir/extra`
++ print_defaults=`find_in_dirs my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra`
+ if test -z "$print_defaults"
+ then
+- cannot_find_file my_print_defaults $basedir/bin $basedir/extra
++ cannot_find_file my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra
+ exit 1
+ fi
+ else
diff --git a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
index 3487b70..8e1a30d 100644
--- a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
@@ -109,3 +109,39 @@ diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
MERGE_LIBRARIES(libmysql SHARED ${LIBS}
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
COMPONENT SharedLibraries)
+diff -aurN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+--- a/scripts/mysql_install_db.sh 2018-08-04 18:20:58.000000000 -0400
++++ b/scripts/mysql_install_db.sh 2018-08-09 12:23:28.707894151 -0400
+@@ -280,10 +280,10 @@
+ print_defaults="$builddir/extra/my_print_defaults"
+ elif test -n "$basedir"
+ then
+- print_defaults=`find_in_dirs my_print_defaults $basedir/bin $basedir/extra`
++ print_defaults=`find_in_dirs my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra`
+ if test -z "$print_defaults"
+ then
+- cannot_find_file my_print_defaults $basedir/bin $basedir/extra
++ cannot_find_file my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra
+ exit 1
+ fi
+ else
+diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
+--- a/scripts/wsrep_sst_common.sh 2018-08-04 18:20:58.000000000 -0400
++++ b/scripts/wsrep_sst_common.sh 2018-08-09 12:30:24.976706933 -0400
+@@ -148,6 +148,7 @@
+ SCRIPTS_DIR="$(cd $(dirname "$0"); pwd -P)"
+ EXTRA_DIR="$SCRIPTS_DIR/../extra"
+ CLIENT_DIR="$SCRIPTS_DIR/../client"
++LIBEXEC_DIR="$SCRIPTS_DIR/../libexec/mariadb"
+
+ if [ -x "$CLIENT_DIR/mysql" ]; then
+ MYSQL_CLIENT="$CLIENT_DIR/mysql"
+@@ -165,6 +166,8 @@
+ MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults"
+ elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then
+ MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults"
++elif [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then
++ MY_PRINT_DEFAULTS="LIBEXEC_DIR/my_print_defaults"
+ else
+ MY_PRINT_DEFAULTS=$(which my_print_defaults)
+ fi
diff --git a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
index a0159fe..e844046 100644
--- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
@@ -186,3 +186,39 @@ diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
FOREACH(file ${BIN_SCRIPTS})
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
+diff -aurN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+--- a/scripts/mysql_install_db.sh 2018-08-04 18:20:58.000000000 -0400
++++ b/scripts/mysql_install_db.sh 2018-08-09 12:23:28.707894151 -0400
+@@ -280,10 +280,10 @@
+ print_defaults="$builddir/extra/my_print_defaults"
+ elif test -n "$basedir"
+ then
+- print_defaults=`find_in_dirs my_print_defaults $basedir/bin $basedir/extra`
++ print_defaults=`find_in_dirs my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra`
+ if test -z "$print_defaults"
+ then
+- cannot_find_file my_print_defaults $basedir/bin $basedir/extra
++ cannot_find_file my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra
+ exit 1
+ fi
+ else
+diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
+--- a/scripts/wsrep_sst_common.sh 2018-08-04 18:20:58.000000000 -0400
++++ b/scripts/wsrep_sst_common.sh 2018-08-09 12:30:24.976706933 -0400
+@@ -148,6 +148,7 @@
+ SCRIPTS_DIR="$(cd $(dirname "$0"); pwd -P)"
+ EXTRA_DIR="$SCRIPTS_DIR/../extra"
+ CLIENT_DIR="$SCRIPTS_DIR/../client"
++LIBEXEC_DIR="$SCRIPTS_DIR/../libexec/mariadb"
+
+ if [ -x "$CLIENT_DIR/mysql" ]; then
+ MYSQL_CLIENT="$CLIENT_DIR/mysql"
+@@ -165,6 +166,8 @@
+ MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults"
+ elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then
+ MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults"
++elif [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then
++ MY_PRINT_DEFAULTS="LIBEXEC_DIR/my_print_defaults"
+ else
+ MY_PRINT_DEFAULTS=$(which my_print_defaults)
+ fi
diff --git a/20018_all_mariadb-5.5.60-without-clientlibs-tools.patch b/20018_all_mariadb-5.5.60-without-clientlibs-tools.patch
index 3115fa6..12d5da2 100644
--- a/20018_all_mariadb-5.5.60-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-5.5.60-without-clientlibs-tools.patch
@@ -112,3 +112,19 @@ diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
MERGE_LIBRARIES(libmysql SHARED ${LIBS}
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
COMPONENT SharedLibraries)
+diff -aurN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+--- a/scripts/mysql_install_db.sh 2018-08-04 18:20:58.000000000 -0400
++++ b/scripts/mysql_install_db.sh 2018-08-09 12:23:28.707894151 -0400
+@@ -280,10 +280,10 @@
+ print_defaults="$builddir/extra/my_print_defaults"
+ elif test -n "$basedir"
+ then
+- print_defaults=`find_in_dirs my_print_defaults $basedir/bin $basedir/extra`
++ print_defaults=`find_in_dirs my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra`
+ if test -z "$print_defaults"
+ then
+- cannot_find_file my_print_defaults $basedir/bin $basedir/extra
++ cannot_find_file my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra
+ exit 1
+ fi
+ else