diff options
| author | unknown <monty@work.mysql.com> | 2001-10-02 21:33:47 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-10-02 21:33:47 +0200 |
| commit | 2e0dc69895280f3b407e56dace32ad9cf25ce356 (patch) | |
| tree | d9089456ab1e47d6aaaaf6706de408fea79fe87e /mysql-test/t/rpl000017-slave.sh | |
| parent | 9b3d608ea7de5da60bd88765b4a52d316dffa708 (diff) | |
| parent | abf1b80cf457702fd883c3a17b1d9eaed1c7c6b6 (diff) | |
| download | mariadb-git-2e0dc69895280f3b407e56dace32ad9cf25ce356.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/strmake.c:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl000017-slave.sh')
| -rwxr-xr-x | mysql-test/t/rpl000017-slave.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/rpl000017-slave.sh b/mysql-test/t/rpl000017-slave.sh index 23117597ca5..c717500ae4a 100755 --- a/mysql-test/t/rpl000017-slave.sh +++ b/mysql-test/t/rpl000017-slave.sh @@ -3,8 +3,8 @@ master-bin.001 4 127.0.0.1 replicate -aaaaaaaaaaaaaaab -9306 +aaaaaaaaaaaaaaabthispartofthepasswordisnotused +$MASTER_MYPORT 1 0 EOF |