Merge branch 'mysql-5.5' into mysql-5.6

bkandasa · bkandasa · commit b5e94c330c7b · 2015-01-16T07:46:59.000+01:00
Bug#17619241 SERVICE OR MYSQLD_SAFE STARTS PICKING WRONG PLUGIN DIRECTORY
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
@@ -504,7 +504,7 @@ 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
+  for dir in lib64/mysql/plugin lib64/plugin lib/mysql/plugin lib/plugin
   do
     if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then
       plugin_dir="${MY_BASEDIR_VERSION}/${dir}"
