bzr push into mysql-5.5 branch (Georgi.Kodinov:3971)

[Georgi Kodinov]

 3971 Georgi Kodinov	2012-09-11 [merge]
      merge

    modified:
      mysql-test/r/contributors.result
      mysql-test/r/show_check.result
      mysql-test/t/show_check.test
      sql/sql_yacc.yy
=== modified file 'scripts/mysqld_safe.sh'
--- a/scripts/mysqld_safe.sh	2011-11-10 13:46:51 +0000
+++ b/scripts/mysqld_safe.sh	2012-08-27 12:30:58 +0000
@@ -413,29 +413,6 @@ else
   DATADIR=@localstatedir@
 fi
 
-#
-# Try to find the plugin directory
-#
-
-# Use user-supplied argument
-if [ -n "${PLUGIN_DIR}" ]; then
-  plugin_dir="${PLUGIN_DIR}"
-else
-  # Try to find plugin dir relative to basedir
-  for dir in lib/mysql/plugin lib/plugin
-  do
-    if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then
-      plugin_dir="${MY_BASEDIR_VERSION}/${dir}"
-      break
-    fi
-  done
-  # Give up and use compiled-in default
-  if [ -z "${plugin_dir}" ]; then
-    plugin_dir='@pkgplugindir@'
-  fi
-fi
-plugin_dir="${plugin_dir}${PLUGIN_VARIANT}"
-
 if test -z "$MYSQL_HOME"
 then 
   if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
@@ -496,6 +473,31 @@ fi
 parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
+
+#
+# Try to find the plugin directory
+#
+
+# Use user-supplied argument
+if [ -n "${PLUGIN_DIR}" ]; then
+  plugin_dir="${PLUGIN_DIR}"
+else
+  # Try to find plugin dir relative to basedir
+  for dir in lib/mysql/plugin lib/plugin
+  do
+    if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then
+      plugin_dir="${MY_BASEDIR_VERSION}/${dir}"
+      break
+    fi
+  done
+  # Give up and use compiled-in default
+  if [ -z "${plugin_dir}" ]; then
+    plugin_dir='@pkgplugindir@'
+  fi
+fi
+plugin_dir="${plugin_dir}${PLUGIN_VARIANT}"
+
+
 # Determine what logging facility to use
 
 # Ensure that 'logger' exists, if it's requested

No bundle (reason: useless for push emails).