| 1 |
commit: 54bb710131c1656d295a016c04e5a85b031e5013 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 5 20:21:51 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 5 20:21:51 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=54bb7101 |
| 7 |
|
| 8 |
Fix ordering of galera SST my_print_defaults location |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
|
| 12 |
20018_all_mariadb-10.1.16-without-clientlibs-tools.patch | 11 ++++++++--- |
| 13 |
20018_all_mariadb-10.2.16-without-clientlibs-tools.patch | 11 ++++++++--- |
| 14 |
2 files changed, 16 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
| 17 |
index 8e1a30d..2664529 100644 |
| 18 |
--- a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
| 19 |
+++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
| 20 |
@@ -136,12 +136,17 @@ diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh |
| 21 |
|
| 22 |
if [ -x "$CLIENT_DIR/mysql" ]; then |
| 23 |
MYSQL_CLIENT="$CLIENT_DIR/mysql" |
| 24 |
-@@ -165,6 +166,8 @@ |
| 25 |
+@@ -165,10 +166,12 @@ |
| 26 |
+ MYSQLDUMP=$(which mysqldump) |
| 27 |
+ fi |
| 28 |
+ |
| 29 |
++if [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then |
| 30 |
++ MY_PRINT_DEFAULTS="$LIBEXEC_DIR/my_print_defaults" |
| 31 |
+-if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then |
| 32 |
++elif [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then |
| 33 |
MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults" |
| 34 |
elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then |
| 35 |
MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults" |
| 36 |
-+elif [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then |
| 37 |
-+ MY_PRINT_DEFAULTS="LIBEXEC_DIR/my_print_defaults" |
| 38 |
else |
| 39 |
MY_PRINT_DEFAULTS=$(which my_print_defaults) |
| 40 |
fi |
| 41 |
|
| 42 |
diff --git a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch |
| 43 |
index e844046..1c61475 100644 |
| 44 |
--- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch |
| 45 |
+++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch |
| 46 |
@@ -213,12 +213,17 @@ diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh |
| 47 |
|
| 48 |
if [ -x "$CLIENT_DIR/mysql" ]; then |
| 49 |
MYSQL_CLIENT="$CLIENT_DIR/mysql" |
| 50 |
-@@ -165,6 +166,8 @@ |
| 51 |
+@@ -165,10 +166,12 @@ |
| 52 |
+ MYSQLDUMP=$(which mysqldump) |
| 53 |
+ fi |
| 54 |
+ |
| 55 |
++if [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then |
| 56 |
++ MY_PRINT_DEFAULTS="$LIBEXEC_DIR/my_print_defaults" |
| 57 |
+-if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then |
| 58 |
++elif [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then |
| 59 |
MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults" |
| 60 |
elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then |
| 61 |
MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults" |
| 62 |
-+elif [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then |
| 63 |
-+ MY_PRINT_DEFAULTS="LIBEXEC_DIR/my_print_defaults" |
| 64 |
else |
| 65 |
MY_PRINT_DEFAULTS=$(which my_print_defaults) |
| 66 |
fi |
Archives