List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:May 12 2010 7:13am
Subject:bzr push into mysql-trunk-bugfixing branch (mats:3037 to 3038)
Bug#52737
View as plain text  
 3038 Mats Kindahl	2010-05-11
      Bug #52737: plugin_dir is set to /usr/local/mysql/lib/plugin while starting
                  via mysqld_safe
      
      Plugin dir was set to a hard-coded path instead of relative the base dir.
      
      This patch fixes this by using a path relative the basedir instead of the
      plugin directory indicated by the configuration.

    modified:
      scripts/mysqld_safe.sh
 3037 Alexander Nozdrin	2010-05-11
      Make innodb.innodb_information_schema experimental due to Bug 48883.

    modified:
      mysql-test/collections/default.experimental
=== modified file 'scripts/mysqld_safe.sh'
--- a/scripts/mysqld_safe.sh	2010-04-18 13:32:05 +0000
+++ b/scripts/mysqld_safe.sh	2010-05-11 13:55:52 +0000
@@ -699,7 +699,7 @@ fi
 
 cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS"
 
-plugin_dir="${PLUGIN_DIR:-@pkgplugindir@}${PLUGIN_VARIANT}"
+plugin_dir="${PLUGIN_DIR:-$MY_BASEDIR_VERSION/lib/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/mats@sun.com-20100511135552-18ejzgnx6t1q911f.bundle
Thread
bzr push into mysql-trunk-bugfixing branch (mats:3037 to 3038)Bug#52737Mats Kindahl12 May