database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

sporadic failures of main.bootstrap

Browse Source 
give every bootstrap server its own tmpdir, by default it's var/tmp,
which is shared in --parallel
This commit is contained in:
Sergei Golubchik
2022-09-23 10:52:16 +02:00
parent 59c9e2f202
commit 4fd096df06
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/bootstrap.test
View File

@ -7,7 +7,7 @@ drop table if exists t1;
# Add the datadir to the bootstrap command # Add the datadir to the bootstrap command
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --loose-skip-innodb --plugin-maturity=unknown; let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --tmpdir=$MYSQL_TMP_DIR --default-storage-engine=MyISAM --loose-skip-innodb --plugin-maturity=unknown;
# #
# Check that --bootstrap reads from stdin # Check that --bootstrap reads from stdin
# #

2
mysql-test/main/bootstrap_innodb.test
View File

@ -19,7 +19,7 @@ rollback to savepoint s1;
insert t1 values (5); insert t1 values (5);
commit; commit;
EOF EOF
exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1; exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --tmpdir=$MYSQL_TMP_DIR --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql; remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
source include/start_mysqld.inc; source include/start_mysqld.inc;

2
mysql-test/suite/mariabackup/big_innodb_log.test
View File

@ -7,7 +7,7 @@
--source include/have_debug.inc --source include/have_debug.inc
--let MYSQLD_DATADIR= `select @@datadir` --let MYSQLD_DATADIR= `select @@datadir`
let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --debug-dbug=+d,innodb_small_log_block_no_limit; let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --tmpdir=$MYSQL_TMP_DIR --debug-dbug=+d,innodb_small_log_block_no_limit;
--source include/kill_mysqld.inc --source include/kill_mysqld.inc
--rmdir $MYSQLD_DATADIR --rmdir $MYSQLD_DATADIR