| 1 |
commit: 59179b9fa6353c6d770839914cb2ded055d733e4 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 5 20:38:15 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 5 20:38:15 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=59179b9f |
| 7 |
|
| 8 |
Adjust patch for my_print_defaults location in mysqld_safe |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=672698 |
| 11 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 12 |
|
| 13 |
..._all_mariadb-10.1.16-without-clientlibs-tools.patch | 18 ++++++++++++++++++ |
| 14 |
..._all_mariadb-10.2.16-without-clientlibs-tools.patch | 18 ++++++++++++++++++ |
| 15 |
2 files changed, 36 insertions(+) |
| 16 |
|
| 17 |
diff --git a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
| 18 |
index 2664529..af8305d 100644 |
| 19 |
--- a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
| 20 |
+++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
| 21 |
@@ -150,3 +150,21 @@ diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh |
| 22 |
else |
| 23 |
MY_PRINT_DEFAULTS=$(which my_print_defaults) |
| 24 |
fi |
| 25 |
+diff -aurN a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh |
| 26 |
+--- a/scripts/mysqld_safe.sh 2019-02-09 18:24:09.000000000 -0500 |
| 27 |
++++ b/scripts/mysqld_safe.sh 2019-03-05 15:30:25.455288087 -0500 |
| 28 |
+@@ -133,7 +133,13 @@ |
| 29 |
+ } |
| 30 |
+ |
| 31 |
+ find_in_bin() { |
| 32 |
+- if test -x "$MY_BASEDIR_VERSION/bin/$1" |
| 33 |
++ if test -x "$MY_BASEDIR_VERSION/libexec/mariadb/$1" |
| 34 |
++ then |
| 35 |
++ echo "$MY_BASEDIR_VERSION/libexec/mariadb/$1" |
| 36 |
++ elif test -x "@bindir@/../libexec/mariadb/$1" |
| 37 |
++ then |
| 38 |
++ echo "@bindir@/../libexec/mariadb/$1" |
| 39 |
++ elif test -x "$MY_BASEDIR_VERSION/$1" |
| 40 |
+ then |
| 41 |
+ echo "$MY_BASEDIR_VERSION/bin/$1" |
| 42 |
+ elif test -x "@bindir@/$1" |
| 43 |
|
| 44 |
diff --git a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch |
| 45 |
index 1c61475..d284a93 100644 |
| 46 |
--- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch |
| 47 |
+++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch |
| 48 |
@@ -227,3 +227,21 @@ diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh |
| 49 |
else |
| 50 |
MY_PRINT_DEFAULTS=$(which my_print_defaults) |
| 51 |
fi |
| 52 |
+diff -aurN a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh |
| 53 |
+--- a/scripts/mysqld_safe.sh 2019-02-09 18:24:09.000000000 -0500 |
| 54 |
++++ b/scripts/mysqld_safe.sh 2019-03-05 15:30:25.455288087 -0500 |
| 55 |
+@@ -133,7 +133,13 @@ |
| 56 |
+ } |
| 57 |
+ |
| 58 |
+ find_in_bin() { |
| 59 |
+- if test -x "$MY_BASEDIR_VERSION/bin/$1" |
| 60 |
++ if test -x "$MY_BASEDIR_VERSION/libexec/mariadb/$1" |
| 61 |
++ then |
| 62 |
++ echo "$MY_BASEDIR_VERSION/libexec/mariadb/$1" |
| 63 |
++ elif test -x "@bindir@/../libexec/mariadb/$1" |
| 64 |
++ then |
| 65 |
++ echo "@bindir@/../libexec/mariadb/$1" |
| 66 |
++ elif test -x "$MY_BASEDIR_VERSION/$1" |
| 67 |
+ then |
| 68 |
+ echo "$MY_BASEDIR_VERSION/bin/$1" |
| 69 |
+ elif test -x "@bindir@/$1" |
Archives