From 78f62e9079b6ad3705bb2abb7b48b31143297e86 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Fri, 4 Jan 2019 13:32:51 +0600
Subject: remove duplicated paragraph from mysql_install_db.sh

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
---
 scripts/mysql_install_db.sh | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'scripts/mysql_install_db.sh')

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 0272a19931f..f56de12d931 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -207,9 +207,6 @@ cannot_find_file()
     done
   fi
 
-  echo
-  echo "If you compiled from source, you need to run 'make install' to"
-  echo "copy the software into the correct location ready for operation."
   echo
   echo "If you compiled from source, you need to either run 'make install' to"
   echo "copy the software into the correct location ready for operation."
-- 
cgit v1.2.1


From 50e593386fcbaa1ca7bd2ed9fdfc51fd5102cdab Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Fri, 11 Jan 2019 19:35:46 +1100
Subject: MDEV-14580: mysql_install_db elements based on dirname of
 mysql_install_db

Closes #1086
---
 scripts/mysql_install_db.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'scripts/mysql_install_db.sh')

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index f56de12d931..f1249e1d06b 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -253,6 +253,9 @@ then
     cannot_find_file my_print_defaults $basedir/bin $basedir/extra
     exit 1
   fi
+elif test -x "$(dirname $0)/../@bindir@/my_print_defaults"
+then
+  print_defaults="$(dirname $0)/../@bindir@/my_print_defaults"
 else
   print_defaults="@bindir@/my_print_defaults"
 fi
@@ -304,6 +307,14 @@ then
     cannot_find_file fill_help_tables.sql @pkgdata_locations@
     exit 1
   fi
+# relative from where the script was run for a relocatable install
+elif test -x "$(dirname $0)/../@INSTALL_SBINDIR@/mysqld"
+then
+  basedir="$(dirname $0)/../"
+  bindir="$basedir/@INSTALL_SBINDIR@"
+  resolveip="$bindir/resolveip"
+  mysqld="$basedir/@INSTALL_SBINDIR@/mysqld"
+  pkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
 else
   basedir="@prefix@"
   bindir="@bindir@"
-- 
cgit v1.2.1


From 9c5be7d131f7eb7f27df722463faa2cd8135fd1b Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 14 Jan 2019 15:55:21 +0100
Subject: MDEV-14580: mysql_install_db elements based on dirname of
 mysql_install_db

Avoid introducing new dependencies or new syntax.
That is, don't use $(...) and don't assume dirname is present.

And remove unsighty /foo/bar/../xyz from the path. Use dirname
instead of ../
---
 scripts/mysql_install_db.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'scripts/mysql_install_db.sh')

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index f1249e1d06b..9f00562f4bd 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -36,6 +36,9 @@ in_rpm=0
 ip_only=0
 cross_bootstrap=0
 
+dirname0=`dirname $0 2>/dev/null`
+dirname0=`dirname $dirname0 2>/dev/null`
+
 usage()
 {
   cat <<EOF
@@ -253,9 +256,9 @@ then
     cannot_find_file my_print_defaults $basedir/bin $basedir/extra
     exit 1
   fi
-elif test -x "$(dirname $0)/../@bindir@/my_print_defaults"
+elif test -n "$dirname0" -a -x "$dirname0/@bindir@/my_print_defaults"
 then
-  print_defaults="$(dirname $0)/../@bindir@/my_print_defaults"
+  print_defaults="$dirname0/@bindir@/my_print_defaults"
 else
   print_defaults="@bindir@/my_print_defaults"
 fi
@@ -308,9 +311,9 @@ then
     exit 1
   fi
 # relative from where the script was run for a relocatable install
-elif test -x "$(dirname $0)/../@INSTALL_SBINDIR@/mysqld"
+elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld"
 then
-  basedir="$(dirname $0)/../"
+  basedir="$dirname0"
   bindir="$basedir/@INSTALL_SBINDIR@"
   resolveip="$bindir/resolveip"
   mysqld="$basedir/@INSTALL_SBINDIR@/mysqld"
-- 
cgit v1.2.1