summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql_plugin.test
diff options
context:
space:
mode:
authorChuck Bell <chuck.bell@oracle.com>2011-07-19 10:27:15 -0400
committerChuck Bell <chuck.bell@oracle.com>2011-07-19 10:27:15 -0400
commit9e112497785d5e7ce627c825aa39e2b17a5aa73e (patch)
tree1553e57586359510038c0a8d911c66b5f426c11a /mysql-test/t/mysql_plugin.test
parent33a36da65a0e5403903bc85d1c85729b54c0968e (diff)
downloadmariadb-git-9e112497785d5e7ce627c825aa39e2b17a5aa73e.tar.gz
BUG#12707948 : mysql_plugin cannot run on Windows
Patch fixes an issue with reading basedir on Windows. It fixes how the code interprets opt_basedir on Windows by adding the correct path separators and quotes for paths with spaces. BUG#12664302 : mysql_plugin cannot recognize the plugin config file Patch fixes an issue with reading a plugin config file. It adds more information to the error messages to ensure the user is using the options correctly. Also deals with paths with spacs on Windows.
Diffstat (limited to 'mysql-test/t/mysql_plugin.test')
-rw-r--r--mysql-test/t/mysql_plugin.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_plugin.test b/mysql-test/t/mysql_plugin.test
index 3257adfeb61..c2c0a403ab3 100644
--- a/mysql-test/t/mysql_plugin.test
+++ b/mysql-test/t/mysql_plugin.test
@@ -149,7 +149,7 @@ let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=
--echo #
--echo # Missing library
--echo #
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR/sql --plugin-dir=$MYSQL_TEST_DIR/include/;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR/sql --plugin-dir=$DAEMONEXAMPLE_DIR --plugin-ini=$MYSQL_TEST_DIR/include/daemon_example_bad_soname.ini;
--error 1,2,256
--exec $MYSQLD_BOOTSTRAP_CMD DISABLE daemon_example 2>&1