Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.

17 files changed, 23 insertions, 2 deletions

diff --git a/support-files/MacOSX/Description.plist.sh b/support-files/MacOSX/Description.plist.sh
index 3d8a523f7c1..1acae093db2 100644
--- a/support-files/MacOSX/Description.plist.sh
+++ b/support-files/MacOSX/Description.plist.sh
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    Copyright (C) 2003 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/Info.plist.sh b/support-files/MacOSX/Info.plist.sh
index e7a8e462e33..4cc1957a3ea 100644
--- a/support-files/MacOSX/Info.plist.sh
+++ b/support-files/MacOSX/Info.plist.sh
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    Copyright (C) 2003, 2008 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/MySQLCOM b/support-files/MacOSX/MySQLCOM
index a0d90c9d4c0..4de6485ae7c 100755
--- a/support-files/MacOSX/MySQLCOM
+++ b/support-files/MacOSX/MySQLCOM
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2003, 2004 MySQL AB
+# Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/StartupItem.Description.plist b/support-files/MacOSX/StartupItem.Description.plist
index 6c06be0a9c0..e8d720ae5f1 100644
--- a/support-files/MacOSX/StartupItem.Description.plist
+++ b/support-files/MacOSX/StartupItem.Description.plist
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    Copyright (C) 2003, 2004 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/StartupItem.Info.plist b/support-files/MacOSX/StartupItem.Info.plist
index f4dd8c58d0c..9891668e283 100644
--- a/support-files/MacOSX/StartupItem.Info.plist
+++ b/support-files/MacOSX/StartupItem.Info.plist
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    Copyright (C) 2003 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/StartupItem.postinstall b/support-files/MacOSX/StartupItem.postinstall
index 355c0749928..b3814db5ddf 100755
--- a/support-files/MacOSX/StartupItem.postinstall
+++ b/support-files/MacOSX/StartupItem.postinstall
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2003 MySQL AB
+# Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/StartupParameters.plist.sh b/support-files/MacOSX/StartupParameters.plist.sh
index 804bccfc9da..66cc93fd842 100644
--- a/support-files/MacOSX/StartupParameters.plist.sh
+++ b/support-files/MacOSX/StartupParameters.plist.sh
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    Copyright (C) 2003 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/mwar-wrapper b/support-files/MacOSX/mwar-wrapper
index 9e8d4bb4d74..8d424df11b7 100755
--- a/support-files/MacOSX/mwar-wrapper
+++ b/support-files/MacOSX/mwar-wrapper
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2005 MySQL AB
+# Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/mwcc-wrapper b/support-files/MacOSX/mwcc-wrapper
index 7bcda73f47d..6de7a321833 100755
--- a/support-files/MacOSX/mwcc-wrapper
+++ b/support-files/MacOSX/mwcc-wrapper
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2005 MySQL AB
+# Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/support-files/MacOSX/postflight.sh b/support-files/MacOSX/postflight.sh
index d326ab80f88..00ba30dffc4 100644
--- a/support-files/MacOSX/postflight.sh
+++ b/support-files/MacOSX/postflight.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2003, 2005 MySQL AB
+# Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/support-files/MacOSX/preflight.sh b/support-files/MacOSX/preflight.sh
index 05f04baae71..52f18a54967 100644
--- a/support-files/MacOSX/preflight.sh
+++ b/support-files/MacOSX/preflight.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2003, 2005 MySQL AB
+# Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/support-files/RHEL4-SElinux/mysql.fc b/support-files/RHEL4-SElinux/mysql.fc
index 208bf6af2c1..aa0fced4bbc 100644
--- a/support-files/RHEL4-SElinux/mysql.fc
+++ b/support-files/RHEL4-SElinux/mysql.fc
@@ -1,4 +1,5 @@
 # Copyright (C) 2007 MySQL AB
+# Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/support-files/RHEL4-SElinux/mysql.te b/support-files/RHEL4-SElinux/mysql.te
index 62c6a453b85..d2609244640 100644
--- a/support-files/RHEL4-SElinux/mysql.te
+++ b/support-files/RHEL4-SElinux/mysql.te
@@ -1,4 +1,5 @@
 # Copyright (C) 2007 MySQL AB
+# Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 315af529149..6a31ff21c55 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -49,6 +49,7 @@ ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000
 fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits
 log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
 log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
+buf/buf0buf\.c : label.*loop2.* defined but not used
 
 #
 # bdb is not critical to keep up to date
diff --git a/support-files/mysql.m4 b/support-files/mysql.m4
index eb1be0f5445..371700a9c08 100644
--- a/support-files/mysql.m4
+++ b/support-files/mysql.m4
@@ -1,4 +1,5 @@
 # Copyright (C) 2007 MySQL AB
+# Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index b763117188f..b9bd37cbcea 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -148,7 +148,6 @@ parse_server_arguments() {
 		    datadir_set=1
 	;;
       --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-      --socket=*) socket=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
       --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
     esac
   done
@@ -258,10 +257,11 @@ wait_for_ready () {
   test -n "$socket" && sockopt="--socket=$socket"
 
   sst_progress_file=$datadir/sst_in_progress
+
   i=0
   while test $i -ne $service_startup_timeout ; do
 
-    if $bindir/mysqladmin $sockopt ping >/dev/null 2>&1; then
+    if $bindir/mysqladmin ping >/dev/null 2>&1; then
       log_success_msg
       return 0
     fi
@@ -293,6 +293,11 @@ else
   esac
 fi
 
+# source other config files
+[ -f /etc/default/mysql ] && . /etc/default/mysql
+[ -f /etc/sysconfig/mysql ] && . /etc/sysconfig/mysql
+[ -f /etc/conf.d/mysql ] && . /etc/conf.d/mysql
+
 case "$mode" in
   'start')
     # Start daemon
diff --git a/support-files/rpm/server-prein.sh b/support-files/rpm/server-prein.sh
index 9194f2b0656..75f7e7d64cf 100644
--- a/support-files/rpm/server-prein.sh
+++ b/support-files/rpm/server-prein.sh
@@ -3,6 +3,7 @@
 
 installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
 if [ $? -eq 0 -a -n "$installed" ]; then
+  installed=`echo "$installed"|sed -n 1p`
   vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
   version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
   myvendor='%{mysql_vendor}'