Merge branch 'mysql-5.6' into mysql-5.7

Author: trosten

packaging/rpm-oel/mysql.init

@@ -34,26 +34,29 @@ lockfile=/var/lock/subsys/$prog
 command=$1 && shift
 extra_opts="$@"
 
-# extract value of a MySQL option from config files
-# Usage: get_mysql_option SECTION VARNAME DEFAULT
-# result is returned in $result
+# Extract value of a MySQL option from config files
+# Usage: get_mysql_option OPTION DEFAULT SECTION1 SECTION2 SECTIONN
+# Result is returned in $result
 # We use my_print_defaults which prints all options from multiple files,
 # with the more specific ones later; hence take the last match.
-get_mysql_option(){
-	result=$(/usr/bin/my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1)
-	if [ -z "$result" ]; then
-	    # not found, use default
-	    result="$3"
-	fi
+get_mysql_option () {
+    option=$1
+    default=$2
+    shift 2
+    result=$(/usr/bin/my_print_defaults "$@" | sed -n "s/^--${option}=//p" | tail -n 1)
+    if [ -z "$result" ]; then
+	# not found, use default
+	result="${default}"
+    fi
 }
 
-get_mysql_option mysqld datadir "/var/lib/mysql"
+get_mysql_option datadir "/var/lib/mysql" mysqld
 datadir="$result"
-get_mysql_option mysqld socket "$datadir/mysql.sock"
+get_mysql_option socket "$datadir/mysql.sock" mysqld
 socketfile="$result"
-get_mysql_option mysqld_safe log-error "/var/log/mysqld.log"
+get_mysql_option log-error "/var/log/mysqld.log" mysqld mysqld_safe
 errlogfile="$result"
-get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
+get_mysql_option pid-file "/var/run/mysqld/mysqld.pid" mysqld mysqld_safe
 mypidfile="$result"
 
 case $socketfile in

packaging/rpm-sles/mysql.init

@@ -57,17 +57,17 @@ command=$1 && shift
 extra_opts="$@"
 
 get_option () {
-    local section=$1
-    local option=$2
-    local default=$3
-    ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2- | tail -n 1)
-    [ -z $ret ] && ret=$default
+    local option=$1
+    local default=$2
+    shift 2
+    ret=$(/usr/bin/my_print_defaults "$@" | sed -n "s/^--${option}=//p" | tail -n 1)
+    [ -z $ret ] && ret=${default}
     echo $ret
 }
 
-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")
+datadir=$(get_option datadir "/var/lib/mysql" mysqld)
+socket=$(get_option  socket "$datadir/mysql.sock" mysqld)
+pidfile=$(get_option pid-file "/var/run/mysql/mysqld.pid" mysqld mysqld_safe)
 
 install_validate_password_sql_file () {
     local dir
@@ -86,8 +86,8 @@ install_validate_password_sql_file () {
 install_db () {
     # Note: something different than datadir=/var/lib/mysql requires 
     # SELinux policy changes (in enforcing mode)
-    datadir=$(get_option mysqld datadir "/var/lib/mysql")
-    logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
+    datadir=$(get_option datadir "/var/lib/mysql" mysqld)
+    logfile=$(get_option log-error "/var/log/mysql/mysqld.log" mysqld mysqld_safe)
 
     # Restore log, dir, perms and SELinux contexts
     if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then