Merge branch 'mysql-5.5' into mysql-5.6

(cherry picked from commit 00189280432ac459d657417f7ec42aed651d5ec0)

Author: trosten

packaging/rpm-fedora/mysql-systemd-start

@@ -22,7 +22,9 @@ install_db () {
     datadir=$(get_option mysqld datadir "/var/lib/mysql")
 
     # Restore log, dir, perms and SELinux contexts
-    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    fi
     log=/var/log/mysqld.log
     [ -e $log ] || touch $log
     chmod 0640 $log

packaging/rpm-fedora/mysqld.service

@@ -34,7 +34,7 @@ PermissionsStartOnly=true
 ExecStartPre=/usr/bin/mysql-systemd-start pre
 
 # Start main service
-ExecStart=/usr/bin/mysqld_safe
+ExecStart=/usr/bin/mysqld_safe --basedir=/usr
 
 # Don't signal startup success before a ping works
 ExecStartPost=/usr/bin/mysql-systemd-start post

packaging/rpm-oel/mysql-systemd-start

@@ -22,7 +22,9 @@ install_db () {
     datadir=$(get_option mysqld datadir "/var/lib/mysql")
 
     # Restore log, dir, perms and SELinux contexts
-    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    fi
     log=/var/log/mysqld.log
     [ -e $log ] || touch $log
     chmod 0640 $log

packaging/rpm-oel/mysql.init

@@ -70,18 +70,19 @@ 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 -m0755 -omysql -gmysql "$datadir" || exit 1
+	    fi
+	    if [ ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+		chown mysql:mysql "$datadir"
+		chmod 0755 "$datadir"
 	    fi
-	    chown mysql:mysql "$datadir"
-	    chmod 0755 "$datadir"
 	    if [ -x /sbin/restorecon ]; then
 		/sbin/restorecon "$datadir"
 		for dir in /var/lib/mysql-files ; do
@@ -94,13 +95,14 @@ start(){
 	    # Now create the database
 	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
 	    ret=$?
-	    chown -R mysql:mysql "$datadir"
 	    if [ $ret -ne 0 ] ; then
 		return $ret
 	    fi
 	fi
-	chown mysql:mysql "$datadir"
-	chmod 0755 "$datadir"
+	if [ ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	    chown mysql:mysql "$datadir"
+	    chmod 0755 "$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-oel/mysqld.service

@@ -34,7 +34,7 @@ PermissionsStartOnly=true
 ExecStartPre=/usr/bin/mysql-systemd-start pre
 
 # Start main service
-ExecStart=/usr/bin/mysqld_safe
+ExecStart=/usr/bin/mysqld_safe --basedir=/usr
 
 # Don't signal startup success before a ping works
 ExecStartPost=/usr/bin/mysql-systemd-start post

packaging/rpm-sles/mysql-systemd-start

@@ -13,7 +13,9 @@ 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
-    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+       install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    fi
     log=/var/log/mysql/mysqld.log
     [ -e $log ] || touch $log
     chmod 0640 $log

packaging/rpm-sles/mysql.init

@@ -65,7 +65,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_db () {
     # Note: something different than datadir=/var/lib/mysql requires 
@@ -74,14 +73,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 0755 -omysql -gmysql "$datadir" || return 1
+    if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
+	install -d -m 0755 -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 

packaging/rpm-sles/mysqld.service

@@ -34,7 +34,7 @@ PermissionsStartOnly=true
 ExecStartPre=/usr/bin/mysql-systemd-start pre
 
 # Start main service
-ExecStart=/usr/bin/mysqld_safe
+ExecStart=/usr/bin/mysqld_safe --basedir=/usr
 
 # Don't signal startup success before a ping works
 ExecStartPost=/usr/bin/mysql-systemd-start post

scripts/mysqld_safe.sh

@@ -219,7 +219,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
@@ -395,7 +401,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