diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-03 17:16:09 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-03 17:16:09 +0200 |
| commit | 8aff7ae9a6128bc2c3d70db3e4c40b43924e95a4 (patch) | |
| tree | d40f2d9cea7a174420ff06f6f0425f3a83b15333 /mysql-test | |
| parent | 469c998b75b5b0c756f73fe3dcfcd32e0b9ba608 (diff) | |
| parent | 391bc11a2121919a29a2579639bc476b6c25fa6a (diff) | |
| download | mariadb-git-8aff7ae9a6128bc2c3d70db3e4c40b43924e95a4.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/Makefile.am | 4 | ||||
| -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 |
4 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index a91baa1538e..d897bdecb59 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -27,7 +27,7 @@ CLEANFILES = $(test_SCRIPTS) dist-hook: mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \ $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.001 $(distdir)/std_data @@ -41,6 +41,8 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include 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 |