bzr commit into mysql-5.5 branch (saikumar.v:3481)

[Saikumar V]

#At file:///home/saikumar/work/opt-test/mysql-5.5-wl-5710/ based on revid:saikumar.v@stripped

 3481 Saikumar V	2011-07-29
      Fixed one negative test path.

    modified:
      mysql-test/t/mysql_plugin.test
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-07-28 18:46:04 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-07-29 09:09:16 +0000
@@ -10,10 +10,12 @@ let $MYSQL_BASEDIR= `select @@basedir`;
 
 # The mysql_plugin tool expects all executables in "basedir", so they will be copied to it.
 # It also expects a directory structure like in the installed mysql version, so errmsg.sys
-# will be copied to "basedir/share". The directories differ between Windows and Unix.
+# will be copied to "basedir/share". 
 --disable_abort_on_error
 
-#Gather the mysqld path from the MYSQLD_BOOTSTRAP_CMD line.
+# The mysql_plugin tool now accepts --mysqld the path to mysqld server,
+# the mysqld path is extracted from MYSQLD_BOOTSTRAP_CMD line.
+# The directories differ between Windows and Unix.
 perl;
   my ($mysqld)= split " ", $ENV{MYSQLD_BOOTSTRAP_CMD};
   open(FILE, ">", "$ENV{MYSQL_TMP_DIR}/mysqld.inc") or die;
@@ -157,7 +159,7 @@ let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN
 --echo # 
 --echo # Attempt to use bad paths - plugin_dir
 --echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=/plugin_not_there/;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=/plugin_not_there/ --mysqld=$MYSQLD --my_print_defaults=$MYSQL_MY_PRINT_DEFAULTS;
 --error 1,2,256
 --exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1
 


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