diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/Makefile.am | 12 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 1 | ||||
| -rwxr-xr-x | mysql-test/t/rpl000017-slave.sh | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl000017.test | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 30852ba5671..d7fab3940f2 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -38,12 +38,12 @@ install-data-local: $(DESTDIR)$(testdir)/r \ $(DESTDIR)$(testdir)/include \ $(DESTDIR)$(testdir)/std_data - cp -p $(srcdir)/README $(DESTDIR)$(testdir) - cp -p $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t - cp -p $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t - cp -p $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r - cp -p $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include - cp -p $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data + $(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)/r/*.result $(DESTDIR)$(testdir)/r + $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include + $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data SUFFIXES = .sh diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 79fee8d493a..be5e997bf3d 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -392,6 +392,7 @@ start_slave() master_info="--master-user=root \ --master-connect-retry=1 \ --master-host=127.0.0.1 \ + --master-password= \ --master-port=$MASTER_MYPORT \ --server-id=2" else diff --git a/mysql-test/t/rpl000017-slave.sh b/mysql-test/t/rpl000017-slave.sh index fe875f1a778..4415f093aad 100755 --- a/mysql-test/t/rpl000017-slave.sh +++ b/mysql-test/t/rpl000017-slave.sh @@ -2,8 +2,8 @@ cat > $MYSQL_TEST_DIR/var/slave-data/master.info <<EOF master-bin.001 4 127.0.0.1 -root - +replicate +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 9306 1 EOF diff --git a/mysql-test/t/rpl000017.test b/mysql-test/t/rpl000017.test index c93d861bec8..d695561b671 100644 --- a/mysql-test/t/rpl000017.test +++ b/mysql-test/t/rpl000017.test @@ -2,6 +2,8 @@ connect (master,localhost,root,,test,0,mysql-master.sock); connect (slave,localhost,root,,test,0,mysql-slave.sock); connection master; reset master; +grant file on *.* to replicate@localhost identified by + 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'; connection slave; slave start; connection master; |