Merge branch 'mysql-5.6' into mysql-5.7

(cherry picked from commit 009d62b68f3bf0ba8afc5e7bb39fb61caf8022f4)

Author: bkandasa

packaging/rpm-oel/mysql.init

@@ -90,10 +90,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 -m0751 -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 0751 "$datadir"
 	    fi
@@ -121,7 +121,7 @@ start(){
 		/usr/bin/mysql_ssl_rsa_setup --datadir="$datadir" --uid=mysql >/dev/null 2>&1
 	    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 0751 "$datadir"
 	fi

packaging/rpm-sles/mysql.init

@@ -90,7 +90,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 0751 -omysql -gmysql "$datadir" || return 1
     fi
 

scripts/systemd/mysqld_pre_systemd.in

@@ -46,7 +46,7 @@ install_db () {
 
     # 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 0751 -o@MYSQLD_USER@ -g@MYSQLD_USER@ "$datadir" || exit 1
     fi