Skip to content

Commit 9dce783

Browse files
committed
fix spider/bugfix.mdev_22979 test
* remove the file to be --repeat friendly * specify the correct defaults-group-suffix. Spider doesn't use the conventional .1 group, so MYSQLD_CMD skips a lot of config options, in particular it doesn't read --tmpdir and creates files in /tmp
1 parent 240b4e8 commit 9dce783

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

storage/spider/mysql-test/spider/bugfix/t/mdev_22979.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ let $PLUGIN_DIR=`select @@plugin_dir`;
1212
--write_file $MYSQLTEST_VARDIR/tmp/mdev_22979.sql
1313
drop table if exists foo.bar;
1414
EOF
15-
--exec $MYSQLD_CMD --datadir=$MYSQLD_DATADIR --bootstrap --plugin-dir=$PLUGIN_DIR --plugin-load-add=ha_spider < $MYSQLTEST_VARDIR/tmp/mdev_22979.sql
15+
--exec $MYSQLD --defaults-group-suffix=.1.1 --defaults-file=$MYSQLTEST_VARDIR/my.cnf --datadir=$MYSQLD_DATADIR --bootstrap --plugin-dir=$PLUGIN_DIR --plugin-load-add=ha_spider < $MYSQLTEST_VARDIR/tmp/mdev_22979.sql
1616
--source include/start_mysqld.inc
1717
--disable_query_log
1818
--source ../../include/clean_up_spider.inc
19+
--remove_file $MYSQLTEST_VARDIR/tmp/mdev_22979.sql

0 commit comments

Comments
 (0)