mysql-5.5.29 merge

1 files changed, 25 insertions, 23 deletions

diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index ce77caadfa8..f49f885bf5a 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -450,29 +450,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"
@@ -533,6 +510,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