diff options
author | unknown <serg@serg.mylan> | 2004-11-22 20:15:48 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2004-11-22 20:15:48 +0100 |
commit | f57d5412e47aa85941ea03ec3e63b017dac8c1ba (patch) | |
tree | 7ec89b0ce88b5a6f693ad09af5d200e916d948d2 /mysql-test/t/rpl000001.test | |
parent | 1dc1ad9c9a5ac128a9f03f3729075b1dac21d347 (diff) | |
parent | 158d655cc06baf3768cf94c3ce182ec57012ce37 (diff) | |
download | mariadb-git-f57d5412e47aa85941ea03ec3e63b017dac8c1ba.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
Docs/Support/texi2html:
Auto merged
client/mysqltest.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/rpl000015.result:
Auto merged
mysql-test/r/rpl_log_pos.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl000015.test:
Auto merged
mysql-test/t/rpl_log_pos.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl000001.test')
-rw-r--r-- | mysql-test/t/rpl000001.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test index 2e0ba2fff25..835af92186f 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -98,7 +98,7 @@ wait_for_slave_to_stop; # The following test can't be done because the result of Pos will differ # on different computers -# --replace_result 9306 9999 3334 9999 3335 9999 +# --replace_result $MASTER_MYPORT MASTER_PORT # show slave status; set global sql_slave_skip_counter=1; |