bzr commit into mysql-trunk-bugfixing branch (mats.kindahl:3096) Bug#52737

[Mats Kindahl]

#At file:///home/bzr/mkindahl/b52737-trunk-bugfixing/ based on revid:alik@stripped

 3096 Mats Kindahl	2010-06-15
      BUG#52737: plugin_dir is set to /usr/local/mysql/lib/plugin while starting via mysqld_safe
      
      Incremental patch to fix plugin_dir from .../lib/plugin to .../lib/mysql/plugin.

    modified:
      scripts/mysqld_safe.sh
=== modified file 'scripts/mysqld_safe.sh'
--- a/scripts/mysqld_safe.sh	2010-05-20 12:35:28 +0000
+++ b/scripts/mysqld_safe.sh	2010-06-15 20:03:04 +0000
@@ -704,7 +704,7 @@ fi
 
 cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS"
 
-plugin_dir="${PLUGIN_DIR:-$MY_BASEDIR_VERSION/lib/plugin}${PLUGIN_VARIANT}"
+plugin_dir="${PLUGIN_DIR:-$MY_BASEDIR_VERSION/lib/mysql/plugin}${PLUGIN_VARIANT}"
 
 for i in  "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
   "--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION"


Attachment: [text/bzr-bundle] bzr/[e-mail]