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 /20018_all_mariadb-5.5.60-without-clientlibs-tools.patch
parentFix tests on 5.6 for clientlibs (diff)
downloadmysql-extras-59a8e4748b669c389241d118a54f23cc1c7a9e9c.tar.gz
mysql-extras-59a8e4748b669c389241d118a54f23cc1c7a9e9c.tar.bz2
mysql-extras-59a8e4748b669c389241d118a54f23cc1c7a9e9c.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
Diffstat (limited to '20018_all_mariadb-5.5.60-without-clientlibs-tools.patch')
-rw-r--r--20018_all_mariadb-5.5.60-without-clientlibs-tools.patch16
1 files changed, 16 insertions, 0 deletions
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