diff options
author | unknown <serg@serg.mylan> | 2004-11-22 18:59:17 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2004-11-22 18:59:17 +0100 |
commit | 0d37be029187de04485f5060b0bdd988a640b21b (patch) | |
tree | 2cbe76e9be7f75acc700310b5db68bc45fe2dc4d /mysql-test | |
parent | e65956d06702ff4530b0e1cb12b4aecc2617ed7f (diff) | |
parent | a0b63729640187349a9b51ef5fe55a291676272a (diff) | |
download | mariadb-git-0d37be029187de04485f5060b0bdd988a640b21b.tar.gz |
merged with ul
BitKeeper/etc/logging_ok:
auto-union
Docs/Support/texi2html:
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
Diffstat (limited to 'mysql-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 ebce3d0ac94..4f978af0bec 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -96,7 +96,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; |