diff options
| author | monty@narttu.mysql.fi <> | 2003-02-26 00:22:35 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-02-26 00:22:35 +0200 |
| commit | 326b8abc898641baa561dcdc7badff6653626953 (patch) | |
| tree | 7ab76a019795a4806b97cb19efc02d2efcfaff5e /mysql-test | |
| parent | c75a4d2468d93c552b81d34795e7d274ec7241f5 (diff) | |
| parent | e6c575dacc5e5df7e0ffa727bb45056cea3d4441 (diff) | |
| download | mariadb-git-326b8abc898641baa561dcdc7badff6653626953.tar.gz | |
merge with 3.23 to get corrected error message files and rename of files in mysql-test
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000015.slave-mi (renamed from mysql-test/t/rpl000015-slave-master-info.opt) | 0 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.slave-mi (renamed from mysql-test/t/rpl_rotate_logs-slave-master-info.opt) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index b05779e8af2..48bb94ea0e4 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1118,7 +1118,7 @@ run_testcase () slave_opt_file=$TESTDIR/$tname-slave.opt master_init_script=$TESTDIR/$tname-master.sh slave_init_script=$TESTDIR/$tname-slave.sh - slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt + slave_master_info_file=$TESTDIR/$tname.slave-mi echo $tname > $CURRENT_TEST SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0` if [ $USE_MANAGER = 1 ] ; then diff --git a/mysql-test/t/rpl000015-slave-master-info.opt b/mysql-test/t/rpl000015.slave-mi index 28bc753dd56..28bc753dd56 100644 --- a/mysql-test/t/rpl000015-slave-master-info.opt +++ b/mysql-test/t/rpl000015.slave-mi diff --git a/mysql-test/t/rpl_rotate_logs-slave-master-info.opt b/mysql-test/t/rpl_rotate_logs.slave-mi index 80190bf6d29..80190bf6d29 100644 --- a/mysql-test/t/rpl_rotate_logs-slave-master-info.opt +++ b/mysql-test/t/rpl_rotate_logs.slave-mi |