diff options
| author | monty@mashka.mysql.fi <> | 2002-09-11 06:40:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-09-11 06:40:08 +0300 |
| commit | f3a186c90566602c18b5fca95f19f92374c06b64 (patch) | |
| tree | 6ef035adfec09ec1e444dd169712750e2de1efeb /mysql-test/mysql-test-run.sh | |
| parent | 5ee7d7e73c5d97c53a435e544d3eb540f704e8c7 (diff) | |
| download | mariadb-git-f3a186c90566602c18b5fca95f19f92374c06b64.tar.gz | |
Portability fixes.
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 9a825ea125e..b51d5fff70b 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -742,6 +742,8 @@ start_master() $RM -f $MASTER_MYDDIR/log.* # Remove stale binary logs $RM -f $MYSQL_TEST_DIR/var/log/master-bin.* + # Remove old master.info files + $RM -f $MYSQL_TEST_DIR/var/master-data/master.info #run master initialization shell script if one exists @@ -858,8 +860,9 @@ start_slave() slave_pid=$SLAVE_MYPID slave_sock="$SLAVE_MYSOCK" fi - # Remove stale binary logs - $RM -f $MYSQL_TEST_DIR/var/log/$slave_ident-bin.* + # Remove stale binary logs and old master.info files + $RM -f $MYSQL_TEST_DIR/var/log/$slave_ident-*bin.* + $RM -f $MYSQL_TEST_DIR/$slave_datadir/master.info #run slave initialization shell script if one exists if [ -f "$slave_init_script" ] ; @@ -1089,8 +1092,8 @@ run_testcase () start_master fi fi - do_slave_restart=0 + do_slave_restart=0 if [ -f $slave_opt_file ] ; then EXTRA_SLAVE_OPT=`$CAT $slave_opt_file | $SED -e "s;\\$MYSQL_TEST_DIR;$MYSQL_TEST_DIR;"` |