[gentoo-commits] proj/mysql-extras:master commit in: /

[Brian Evans]

commit:     54bb710131c1656d295a016c04e5a85b031e5013
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 20:21:51 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 20:21:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=54bb7101

Fix ordering of galera SST my_print_defaults location

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

 20018_all_mariadb-10.1.16-without-clientlibs-tools.patch | 11 ++++++++---
 20018_all_mariadb-10.2.16-without-clientlibs-tools.patch | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

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 8e1a30d..2664529 100644
--- a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
@@ -136,12 +136,17 @@ diff -aurN a/scripts/wsrep_sst_common.sh 
b/scripts/wsrep_sst_common.sh
  
  if [ -x "$CLIENT_DIR/mysql" ]; then
      MYSQL_CLIENT="$CLIENT_DIR/mysql"
-@@ -165,6 +166,8 @@
+@@ -165,10 +166,12 @@
+     MYSQLDUMP=$(which mysqldump)
+ fi
+
++if [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then
++    MY_PRINT_DEFAULTS="$LIBEXEC_DIR/my_print_defaults"
+-if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then
++elif [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then
      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 e844046..1c61475 100644
--- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
@@ -213,12 +213,17 @@ diff -aurN a/scripts/wsrep_sst_common.sh 
b/scripts/wsrep_sst_common.sh
  
  if [ -x "$CLIENT_DIR/mysql" ]; then
      MYSQL_CLIENT="$CLIENT_DIR/mysql"
-@@ -165,6 +166,8 @@
+@@ -165,10 +166,12 @@
+     MYSQLDUMP=$(which mysqldump)
+ fi
+
++if [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then
++    MY_PRINT_DEFAULTS="$LIBEXEC_DIR/my_print_defaults"
+-if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then
++elif [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then
      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