Merge branch 'mysql-5.5' into mysql-5.6

(cherry picked from commit d66d9a678b1b11ce940b2afb624621286af98ab8)

Author: bkandasa

packaging/rpm-fedora/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

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

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

packaging/rpm-sles/mysql-systemd-start

@@ -13,7 +13,7 @@ install_db () {
     datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1)
 
     # 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/mysql/mysqld.log

packaging/rpm-sles/mysql.init

@@ -73,7 +73,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