Commit e24a1833 authored by Alexey Botchkov's avatar Alexey Botchkov

MDEV-9969 mysql_install_db error processing ignore_db_dirs.

        test failed on Windows so fixed by testing slightly differently.
parent 0a50e43e
...@@ -5,5 +5,4 @@ Test non-numeric value passed to number option. ...@@ -5,5 +5,4 @@ Test non-numeric value passed to number option.
Test that bad value for plugin enum option is rejected correctly. Test that bad value for plugin enum option is rejected correctly.
Test that --help --verbose works Test that --help --verbose works
Test that --not-known-option --help --verbose gives error Test that --not-known-option --help --verbose gives error
Test that specifying same directory several times handled properly.
Done. Done.
...@@ -89,3 +89,13 @@ drop table t1; ...@@ -89,3 +89,13 @@ drop table t1;
--replace_result .dll .so --replace_result .dll .so
select * from mysql.plugin; select * from mysql.plugin;
truncate table mysql.plugin; truncate table mysql.plugin;
#
# MDEV-9969 mysql_install_db error processing ignore_db_dirs.
#
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql
use test;
EOF
--exec $MYSQLD_BOOTSTRAP_CMD --ignore-db-dirs='some_dir' --ignore-db-dirs='some_dir' < $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
--remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql
...@@ -56,12 +56,4 @@ mkdir $MYSQLTEST_VARDIR/tmp/mysqld_option_err; ...@@ -56,12 +56,4 @@ mkdir $MYSQLTEST_VARDIR/tmp/mysqld_option_err;
--error 2 --error 2
--exec $MYSQLD_BOOTSTRAP_CMD --not-known-option --help --verbose >>$MYSQLTEST_VARDIR/tmp/mysqld_option_err/mysqltest.log 2>&1 --exec $MYSQLD_BOOTSTRAP_CMD --not-known-option --help --verbose >>$MYSQLTEST_VARDIR/tmp/mysqld_option_err/mysqltest.log 2>&1
#
# MDEV-9969 mysql_install_db error processing ignore_db_dirs.
#
--echo Test that specifying same directory several times handled properly.
--exec echo "" | $MYSQLD_BOOTSTRAP_CMD --skip-networking --datadir=$MYSQLTEST_VARDIR/tmp/mysqld_option_err --skip-grant-tables --ignore-db-dirs='some_dir' --ignore-db-dirs='some_dir' >>$MYSQLTEST_VARDIR/tmp/mysqld_option_err/mysqltest.log 2>&1
--echo Done. --echo Done.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment