diff options
Diffstat (limited to 'mysql-test/t/rpl_000015.test')
-rw-r--r-- | mysql-test/t/rpl_000015.test | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mysql-test/t/rpl_000015.test b/mysql-test/t/rpl_000015.test index 4c557a7c713..e807f7a5b2f 100644 --- a/mysql-test/t/rpl_000015.test +++ b/mysql-test/t/rpl_000015.test @@ -12,26 +12,18 @@ show master status; save_master_pos; connection slave; reset slave; ---replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # -show slave status; +source include/show_slave_status.inc; change master to master_host='127.0.0.1'; # The following needs to be cleaned up when change master is fixed ---replace_result $DEFAULT_MASTER_PORT DEFAULT_MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # -show slave status; +source include/show_slave_status.inc; --replace_result $MASTER_MYPORT MASTER_PORT eval change master to master_host='127.0.0.1',master_user='root', master_password='',master_port=$MASTER_MYPORT; ---replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # -show slave status; +source include/show_slave_status.inc; start slave; sync_with_master; ---replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # -show slave status; +source include/show_slave_status.inc; connection master; --disable_warnings drop table if exists t1; |