Skip to content

Commit e24a183

Browse files
author
Alexey Botchkov
committed
MDEV-9969 mysql_install_db error processing ignore_db_dirs.
test failed on Windows so fixed by testing slightly differently.
1 parent 0a50e43 commit e24a183

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

mysql-test/r/mysqld_option_err.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ Test non-numeric value passed to number option.
55
Test that bad value for plugin enum option is rejected correctly.
66
Test that --help --verbose works
77
Test that --not-known-option --help --verbose gives error
8-
Test that specifying same directory several times handled properly.
98
Done.

mysql-test/t/bootstrap.test

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,13 @@ drop table t1;
8989
--replace_result .dll .so
9090
select * from mysql.plugin;
9191
truncate table mysql.plugin;
92+
93+
94+
#
95+
# MDEV-9969 mysql_install_db error processing ignore_db_dirs.
96+
#
97+
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql
98+
use test;
99+
EOF
100+
--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
101+
--remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql

mysql-test/t/mysqld_option_err.test

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,4 @@ mkdir $MYSQLTEST_VARDIR/tmp/mysqld_option_err;
5656
--error 2
5757
--exec $MYSQLD_BOOTSTRAP_CMD --not-known-option --help --verbose >>$MYSQLTEST_VARDIR/tmp/mysqld_option_err/mysqltest.log 2>&1
5858

59-
#
60-
# MDEV-9969 mysql_install_db error processing ignore_db_dirs.
61-
#
62-
63-
--echo Test that specifying same directory several times handled properly.
64-
65-
--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
66-
6759
--echo Done.

0 commit comments

Comments
 (0)