diff options
| author | unknown <ingo@mysql.com> | 2004-05-10 12:15:40 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2004-05-10 12:15:40 +0200 |
| commit | 3f46a5fd600544347b6fd8de9febab11db145a55 (patch) | |
| tree | 93b90b4e2be2833e7b1780f328c88318819a6f58 /mysql-test/t/rpl_rotate_logs.test | |
| parent | 146019b593e9806a80863bb55c06dd3cbfcd34d9 (diff) | |
| download | mariadb-git-3f46a5fd600544347b6fd8de9febab11db145a55.tar.gz | |
Fix replace_result of $MASTER_MYPORT instead of literal numbers.
mysql-test/t/rpl000015.test:
Fix replace_result of $MASTER_MYPORT instead of literal numbers.
The test case rpl000015 needs one exlpicit literal number.
It changes partial master settings, which seems to reset other settings
to their defaults. To test this is obviously the intent of this case.
Diffstat (limited to 'mysql-test/t/rpl_rotate_logs.test')
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test index 70366fc1749..76a06d01fa9 100644 --- a/mysql-test/t/rpl_rotate_logs.test +++ b/mysql-test/t/rpl_rotate_logs.test @@ -25,13 +25,13 @@ system chmod 600 var/slave-data/master.info; # init_strvar_from_file() in init_master_info()). --error 1201 slave start; ---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT +--replace_result $MASTER_MYPORT MASTER_PORT # CHANGE MASTER will fail because it first parses master.info before changing it # (so when master.info is bad, people have to use RESET SLAVE first). --error 1201 eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root'; reset slave; ---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT +--replace_result $MASTER_MYPORT MASTER_PORT eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root'; connection master; reset master; @@ -49,7 +49,7 @@ insert into t1 values('Could not break slave'),('Tried hard'); save_master_pos; connection slave; sync_with_master; ---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT +--replace_result $MASTER_MYPORT MASTER_PORT --replace_column 18 # show slave status; select * from t1; @@ -101,7 +101,7 @@ insert into t2 values (65); save_master_pos; connection slave; sync_with_master; ---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT +--replace_result $MASTER_MYPORT MASTER_PORT --replace_column 18 # show slave status; select * from t2; @@ -133,7 +133,7 @@ connection slave; sync_with_master; select * from t4; ---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT +--replace_result $MASTER_MYPORT MASTER_PORT --replace_column 18 # show slave status; # because of concurrent insert, the table may not be up to date |