From 59179b9fa6353c6d770839914cb2ded055d733e4 Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Tue, 5 Mar 2019 15:38:15 -0500
Subject: Adjust patch for my_print_defaults location in mysqld_safe

Bug: https://bugs.gentoo.org/show_bug.cgi?id=672698
Signed-off-by: Brian Evans <grknight@gentoo.org>
---
 ..._all_mariadb-10.1.16-without-clientlibs-tools.patch | 18 ++++++++++++++++++
 ..._all_mariadb-10.2.16-without-clientlibs-tools.patch | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

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 2664529..af8305d 100644
--- a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
@@ -150,3 +150,21 @@ diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
  else
      MY_PRINT_DEFAULTS=$(which my_print_defaults)
  fi
+diff -aurN a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
+--- a/scripts/mysqld_safe.sh	2019-02-09 18:24:09.000000000 -0500
++++ b/scripts/mysqld_safe.sh	2019-03-05 15:30:25.455288087 -0500
+@@ -133,7 +133,13 @@
+ }
+ 
+ find_in_bin() {
+-  if test -x "$MY_BASEDIR_VERSION/bin/$1"
++  if test -x "$MY_BASEDIR_VERSION/libexec/mariadb/$1"
++  then
++    echo "$MY_BASEDIR_VERSION/libexec/mariadb/$1"
++  elif test -x "@bindir@/../libexec/mariadb/$1"
++  then
++    echo "@bindir@/../libexec/mariadb/$1"
++  elif test -x "$MY_BASEDIR_VERSION/$1"
+   then
+     echo "$MY_BASEDIR_VERSION/bin/$1"
+   elif test -x "@bindir@/$1"
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 1c61475..d284a93 100644
--- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
@@ -227,3 +227,21 @@ diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
  else
      MY_PRINT_DEFAULTS=$(which my_print_defaults)
  fi
+diff -aurN a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
+--- a/scripts/mysqld_safe.sh	2019-02-09 18:24:09.000000000 -0500
++++ b/scripts/mysqld_safe.sh	2019-03-05 15:30:25.455288087 -0500
+@@ -133,7 +133,13 @@
+ }
+ 
+ find_in_bin() {
+-  if test -x "$MY_BASEDIR_VERSION/bin/$1"
++  if test -x "$MY_BASEDIR_VERSION/libexec/mariadb/$1"
++  then
++    echo "$MY_BASEDIR_VERSION/libexec/mariadb/$1"
++  elif test -x "@bindir@/../libexec/mariadb/$1"
++  then
++    echo "@bindir@/../libexec/mariadb/$1"
++  elif test -x "$MY_BASEDIR_VERSION/$1"
+   then
+     echo "$MY_BASEDIR_VERSION/bin/$1"
+   elif test -x "@bindir@/$1"
-- 
cgit v1.2.3-65-gdbad