Merge branch 'mysql-5.6' into mysql-trunk

Null-merge to sync 5.6 and trunk.

Author: bkandasa

packaging/rpm-sles/mysql.init

@@ -51,11 +51,6 @@ 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")
 
-case $socket in
-    /*) adminsocket="$socket" ;;
-    *) adminsocket="$datadir/$socket" ;;
-esac
-
 install_db () {
     # Note: something different than datadir=/var/lib/mysql requires 
     # SELinux policy changes (in enforcing mode)
@@ -77,7 +72,7 @@ install_db () {
     [ -d "$datadir/mysql" ] && return 0
 
     # Create initial db
-    /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql
+    /usr/bin/mysql_install_db --datadir="$datadir" --rpm --user=mysql
     return $?
 }
 
@@ -89,7 +84,7 @@ pinger () {
     ret=0
     while [ $timer -gt 0 ]; do
         sleep 1
-        mysqladmin --no-defaults --socket="$adminsocket" ping >/dev/null 2>&1 && break
+        mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 && break
 	timer=$(expr $timer - 1)
 
 	# Check if mysqld_safe is still alive, if not there is no hope
@@ -132,7 +127,7 @@ chk_running () {
 }
 
 start () {
-    if chk_running && mysqladmin --no-defaults --socket="$adminsocket" ping >/dev/null 2>&1 ; then
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
 	echo -n "Starting service MySQL:"
 	rc_reset ; rc_status -v ; rc_exit
     fi
@@ -198,7 +193,7 @@ restart () {
 
 reload () {
     ret=0
-    if chk_running && mysqladmin --no-defaults --socket="$adminsocket" ping >/dev/null 2>&1 ; then
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
 	pid=$(cat "$pidfile")
 	kill -HUP $pid >/dev/null 2>&1
 	echo -n "Reloading service MySQL:"
@@ -211,7 +206,7 @@ reload () {
 }
 
 condrestart () {
-    if chk_running && mysqladmin --no-defaults --socket="$adminsocket" ping >/dev/null 2>&1 ; then
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
 	restart
     fi
 }