diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-26 10:27:54 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-26 10:27:54 +0200 |
| commit | abbc47f5c4a1faaaab7ff0869ae4ad94bf2fba17 (patch) | |
| tree | c2887c7a28838af61fbd67d65ce138a082e7b5db /mysql-test/t/mysql_plugin.test | |
| parent | 08e25cb93f63242dc5b3194ef14c4091207227de (diff) | |
| parent | cbde5cb8832b0345dbef254698b7957ea831edaa (diff) | |
| download | mariadb-git-abbc47f5c4a1faaaab7ff0869ae4ad94bf2fba17.tar.gz | |
merge from 5.5 main
Diffstat (limited to 'mysql-test/t/mysql_plugin.test')
| -rw-r--r-- | mysql-test/t/mysql_plugin.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/mysql_plugin.test b/mysql-test/t/mysql_plugin.test index 2ad9a8de186..b7fbe377e31 100644 --- a/mysql-test/t/mysql_plugin.test +++ b/mysql-test/t/mysql_plugin.test @@ -223,6 +223,7 @@ let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n --datadir=/data_not_there/ --basedir=$MY --echo # Attempt to use bad paths - basedir --echo # let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=/basedir_not_there/ --plugin-dir=$PLUGIN_DIR --mysqld=$MYSQLD_BASEDIR --my-print-defaults=$MYSQL_MY_PRINT_DEFAULTS_BASEDIR; +replace_result "/basedir_not_there//" "/basedir_not_there/"; --error 1,2,256 --exec $MYSQL_PLUGIN_CMD DISABLE daemon_example 2>&1 |