Skip to content

Commit

Permalink
MDEV-9969 mysql_install_db error processing ignore_db_dirs.
Browse files Browse the repository at this point in the history
        test failed on Windows so fixed by testing slightly differently.
  • Loading branch information
Alexey Botchkov committed Jun 18, 2016
1 parent 0a50e43 commit e24a183
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 0 additions & 1 deletion mysql-test/r/mysqld_option_err.result
Original file line number Diff line number Diff line change
Expand Up @@ -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 --help --verbose works
Test that --not-known-option --help --verbose gives error
Test that specifying same directory several times handled properly.
Done.
10 changes: 10 additions & 0 deletions mysql-test/t/bootstrap.test
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,13 @@ drop table t1;
--replace_result .dll .so
select * from 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
8 changes: 0 additions & 8 deletions mysql-test/t/mysqld_option_err.test
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,4 @@ mkdir $MYSQLTEST_VARDIR/tmp/mysqld_option_err;
--error 2
--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.

0 comments on commit e24a183

Please sign in to comment.