Merge branch 'mysql-5.6' into mysql-5.7

(cherry picked from commit 309c25474ee3eaaa7ce732b554db486142bc4c8a)

Author: trosten

packaging/rpm-oel/mysql.init

@@ -84,19 +84,20 @@ start(){
 	ret=0
     else
 	# prepare for start
-	touch "$errlogfile"
-	chown mysql:mysql "$errlogfile"
-	chmod 0640 "$errlogfile"
+	if [ ! -e "$errlogfile" -a ! -h "$errlogfile" -a "x$(dirname "$errlogfile")" = "x/var/log" ]; then
+	    install /dev/null -m0640 -omysql -gmysql "$errlogfile"
+	fi
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
 	if [ ! -d "$datadir/mysql" ] ; then
 	    # First, make sure $datadir is there with correct permissions
-	    if [ ! -e "$datadir" -a ! -h "$datadir" ]
-	    then
-		mkdir -p "$datadir" || exit 1
+	    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+		install -d -m0751 -omysql -gmysql "$datadir" || exit 1
 	    fi
-	    chown mysql:mysql "$datadir"
-	    chmod 0751 "$datadir"
-	    if [ -x /sbin/restorecon ] ; then
+	    if [ ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+		chown mysql:mysql "$datadir"
+		chmod 0751 "$datadir"
+	    fi
+	    if [ -x /sbin/restorecon ]; then
 		/sbin/restorecon "$datadir"
 		for dir in /var/lib/mysql-files /var/lib/mysql-keyring ; do
 		    if [ -x /usr/sbin/semanage -a -d /var/lib/mysql -a -d $dir ] ; then
@@ -120,8 +121,10 @@ start(){
 		/usr/bin/mysql_ssl_rsa_setup --datadir="$datadir" --uid=mysql >/dev/null 2>&1
 	    fi
 	fi
-	chown mysql:mysql "$datadir"
-	chmod 0751 "$datadir"
+	if [ ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	    chown mysql:mysql "$datadir"
+	    chmod 0751 "$datadir"
+	fi
 	# Pass all the options determined above, to ensure consistent behavior.
 	# In many cases mysqld_safe would arrive at the same conclusions anyway
 	# but we need to be sure.  (An exception is that we don't force the

packaging/rpm-sles/mysql.init

@@ -68,7 +68,6 @@ get_option () {
 datadir=$(get_option mysqld datadir "/var/lib/mysql")
 socket=$(get_option  mysqld socket "$datadir/mysql.sock")
 pidfile=$(get_option mysqld_safe pid-file "/var/run/mysql/mysqld.pid")
-logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
 
 install_validate_password_sql_file () {
     local dir
@@ -91,14 +90,16 @@ install_db () {
     logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
 
     # Restore log, dir, perms and SELinux contexts
-    [ -d "$datadir" ] || install -d -m 0751 -omysql -gmysql "$datadir" || return 1
+    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	install -d -m 0751 -omysql -gmysql "$datadir" || return 1
+    fi
 
-    [ -e $logfile ] || touch $logfile || return 1
-    chmod 0640 $logfile
-    chown mysql:mysql $logfile || return 1
+    if [ ! -e "$logfile" -a ! -h "$logfile" -a "x$(dirname "$logfile")" = "x/var/log/mysql" ]; then
+	install /dev/null -omysql -gmysql "$logfile" || return 1
+    fi
     if [ -x /usr/sbin/restorecon ]; then
         /usr/sbin/restorecon "$datadir"
-        /usr/sbin/restorecon $logfile
+        /usr/sbin/restorecon "$logfile"
     fi
 
     # If special mysql dir is in place, skip db install 

scripts/mysqld_safe.sh

@@ -234,7 +234,13 @@ parse_arguments() {
 
       # mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])!
       --core-file-size=*) core_file_size="$val" ;;
-      --ledir=*) ledir="$val" ;;
+      --ledir=*)
+        if [ -z "$pick_args" ]; then
+          log_error "--ledir option can only be used as command line option, found in config file"
+          exit 1
+        fi
+        ledir="$val"
+        ;;
       --malloc-lib=*) set_malloc_lib "$val" ;;
       --mysqld=*)
         if [ -z "$pick_args" ]; then
@@ -411,7 +417,15 @@ else
   relpkgdata='@pkgdatadir@'
 fi
 
-MY_PWD=`pwd`
+case "$0" in
+  /*)
+  MY_PWD='@prefix@'
+  ;;
+  *)
+  MY_PWD=`dirname $0`
+  MY_PWD=`dirname $MY_PWD`
+  ;;
+esac
 # Check for the directories we would expect from a binary release install
 if test -n "$MY_BASEDIR_VERSION" -a -d "$MY_BASEDIR_VERSION"
 then

scripts/systemd/mysqld_pre_systemd.in

@@ -46,7 +46,9 @@ install_db () {
 
     # Restore log, dir, perms and SELinux contexts
 
-    [ -d "$datadir" ] || install -d -m 0751 -o@MYSQLD_USER@ -g@MYSQLD_USER@ "$datadir" || exit 1
+    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	install -d -m 0751 -o@MYSQLD_USER@ -g@MYSQLD_USER@ "$datadir" || exit 1
+    fi
 
     if [ ! -e "$log" -a ! -h "$log" -a x$(dirname "$log") = "x/var/log" ]; then
 	case $(basename "$log") in