diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-09-23 10:52:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-09-26 15:01:36 +0200 |
| commit | 4fd096df0637a0ef861aea8bb00edc13b0f32475 (patch) | |
| tree | 465cd1340fc17fe6f6d9cf30b26109a8e73f353a | |
| parent | 59c9e2f20229c297d4d05ec04d17efea96f64466 (diff) | |
| download | mariadb-git-4fd096df0637a0ef861aea8bb00edc13b0f32475.tar.gz | |
sporadic failures of main.bootstrap
give every bootstrap server its own tmpdir, by default it's var/tmp,
which is shared in --parallel
| -rw-r--r-- | mysql-test/main/bootstrap.test | 2 | ||||
| -rw-r--r-- | mysql-test/main/bootstrap_innodb.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/big_innodb_log.test | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/bootstrap.test b/mysql-test/main/bootstrap.test index cd13a2748d1..683033979fe 100644 --- a/mysql-test/main/bootstrap.test +++ b/mysql-test/main/bootstrap.test @@ -7,7 +7,7 @@ drop table if exists t1; # Add the datadir to the bootstrap command 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 # diff --git a/mysql-test/main/bootstrap_innodb.test b/mysql-test/main/bootstrap_innodb.test index ddaefb32155..eb3d09c0e74 100644 --- a/mysql-test/main/bootstrap_innodb.test +++ b/mysql-test/main/bootstrap_innodb.test @@ -19,7 +19,7 @@ rollback to savepoint s1; insert t1 values (5); commit; 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; source include/start_mysqld.inc; diff --git a/mysql-test/suite/mariabackup/big_innodb_log.test b/mysql-test/suite/mariabackup/big_innodb_log.test index 4a87ecb18fe..4cddb5e4a70 100644 --- a/mysql-test/suite/mariabackup/big_innodb_log.test +++ b/mysql-test/suite/mariabackup/big_innodb_log.test @@ -7,7 +7,7 @@ --source include/have_debug.inc --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 --rmdir $MYSQLD_DATADIR |