From c8f0eeb9c8596be83fefb7fef9f9871e53edb020 Mon Sep 17 00:00:00 2001
From: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date: Mon, 28 Nov 2016 16:38:03 +0530
Subject: [PATCH] Bug#25159791 BASEDIR: COMMAND NOT FOUND ERROR WHILE STARTING
 SERVER WITH INIT SCRIPTS

(cherry picked from commit 7a39efab8a59ebdcd562fb788bc004ff338796ea)
---
 packaging/rpm-oel/mysql-systemd-start | 2 +-
 packaging/rpm-oel/mysql.init          | 6 +++---
 packaging/rpm-sles/mysql.init         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/rpm-oel/mysql-systemd-start b/packaging/rpm-oel/mysql-systemd-start
index af6e906efe1..c744bdceeb4 100644
--- a/packaging/rpm-oel/mysql-systemd-start
+++ b/packaging/rpm-oel/mysql-systemd-start
@@ -22,7 +22,7 @@ install_db () {
     datadir=$(get_option mysqld datadir "/var/lib/mysql")
 
     # Restore log, dir, perms and SELinux contexts
-    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
 	install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
     fi
     log=/var/log/mysqld.log
diff --git a/packaging/rpm-oel/mysql.init b/packaging/rpm-oel/mysql.init
index 50d1bba017d..c3bbb277b91 100644
--- a/packaging/rpm-oel/mysql.init
+++ b/packaging/rpm-oel/mysql.init
@@ -76,10 +76,10 @@ start(){
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
 	if [ ! -d "$datadir/mysql" ] ; then
 	    # First, make sure $datadir is there with correct permissions
-	    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
 		install -d -m0755 -omysql -gmysql "$datadir" || exit 1
 	    fi
-	    if [ ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	    if [ ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
 		chown mysql:mysql "$datadir"
 		chmod 0755 "$datadir"
 	    fi
@@ -99,7 +99,7 @@ start(){
 		return $ret
 	    fi
 	fi
-	if [ ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	if [ ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
 	    chown mysql:mysql "$datadir"
 	    chmod 0755 "$datadir"
 	fi
diff --git a/packaging/rpm-sles/mysql.init b/packaging/rpm-sles/mysql.init
index 25762d9bee2..62f2a62e1b9 100644
--- a/packaging/rpm-sles/mysql.init
+++ b/packaging/rpm-sles/mysql.init
@@ -57,7 +57,7 @@ install_db () {
     logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
 
     # Restore log, dir, perms and SELinux contexts
-    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
 	install -d -m 0755 -omysql -gmysql "$datadir" || return 1
     fi