summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/mysql-test-run.sh2
-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
-rw-r--r--scripts/make_binary_distribution.sh2
4 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index fcddf52c66b..8b1c8ff1b44 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -706,7 +706,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
SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
if [ -n "$SKIP_TEST" ] ; then
SKIP_THIS_TEST=`$EXPR \( $tname : "$SKIP_TEST" \) != 0`
diff --git a/mysql-test/t/rpl000015-slave-master-info.opt b/mysql-test/t/rpl000015.slave-mi
index 80190bf6d29..80190bf6d29 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
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 2e25cc9bdc4..801f9fb2e05 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -113,7 +113,7 @@ $CP mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/
$CP mysql-test/README $BASE/mysql-test/README
$CP mysql-test/include/*.inc $BASE/mysql-test/include
$CP mysql-test/std_data/*.dat mysql-test/std_data/*.001 $BASE/mysql-test/std_data
-$CP mysql-test/t/*.test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t
+$CP mysql-test/t/*.test mysql-test/t/*.opt mysql-test/t/*.slave-mi mysql-test/t/*.sh $BASE/mysql-test/t
$CP mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r
$CP scripts/* $BASE/bin