diff options
Diffstat (limited to 'mysql-test/suite/multi_source')
| -rw-r--r-- | mysql-test/suite/multi_source/info_logs.test | 14 | ||||
| -rw-r--r-- | mysql-test/suite/multi_source/multisource.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/multi_source/reset_slave.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/multi_source/simple.test | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/mysql-test/suite/multi_source/info_logs.test b/mysql-test/suite/multi_source/info_logs.test index 2f3b1934817..2aaaf14c919 100644 --- a/mysql-test/suite/multi_source/info_logs.test +++ b/mysql-test/suite/multi_source/info_logs.test @@ -137,10 +137,10 @@ let $field= Slave_IO_State; let $condition= = 'Waiting for master to send event'; --source include/wait_show_condition.inc -let read_master_log_pos=`select $binlog_start_pos + 65`; -let relay_log_pos=`select 2*$binlog_start_pos + 105`; -let relay_log_space1=`select 3*$binlog_start_pos + 144`; -let relay_log_space2=`select 3*$binlog_start_pos + 163`; +let read_master_log_pos=`select $binlog_start_pos + 73`; +let relay_log_pos=`select 2*$binlog_start_pos + 117`; +let relay_log_space1=`select 3*$binlog_start_pos + 160`; +let relay_log_space2=`select 3*$binlog_start_pos + 179`; --replace_result $SERVER_MYPORT_1 MYPORT_1 $SERVER_MYPORT_2 MYPORT_2 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space1 <relay_log_space1> $relay_log_space2 <relay_log_space2> show all slaves status; @@ -164,9 +164,9 @@ let $condition= = 'Waiting for master to send event'; --source include/wait_show_condition.inc -let relay_log_pos=`select 2*$binlog_start_pos + 40`; -let relay_log_space1=`select 3*$binlog_start_pos + 79`; -let relay_log_space2=`select 3*$binlog_start_pos + 98`; +let relay_log_pos=`select 2*$binlog_start_pos + 44`; +let relay_log_space1=`select 3*$binlog_start_pos + 87`; +let relay_log_space2=`select 3*$binlog_start_pos + 106`; --replace_result $SERVER_MYPORT_1 MYPORT_1 $SERVER_MYPORT_2 MYPORT_2 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space1 <relay_log_space1> $relay_log_space2 <relay_log_space2> show all slaves status; diff --git a/mysql-test/suite/multi_source/multisource.test b/mysql-test/suite/multi_source/multisource.test index de6874d6423..dfeefe9a1d3 100644 --- a/mysql-test/suite/multi_source/multisource.test +++ b/mysql-test/suite/multi_source/multisource.test @@ -222,7 +222,7 @@ flush logs; --connection master1 purge binary logs to 'master-bin.000002'; -let filesize=`select $binlog_start_pos+119`; +let filesize=`select $binlog_start_pos+131`; --replace_result $filesize filesize show binary logs; insert into t1 (f1) values ('four'); diff --git a/mysql-test/suite/multi_source/reset_slave.test b/mysql-test/suite/multi_source/reset_slave.test index ebbc33e4c22..f708a71d6de 100644 --- a/mysql-test/suite/multi_source/reset_slave.test +++ b/mysql-test/suite/multi_source/reset_slave.test @@ -39,9 +39,9 @@ stop slave 'master1'; --let $datadir = `SELECT @@datadir` -let read_master_log_pos=`select $binlog_start_pos + 554`; -let relay_log_pos=`select 2*$binlog_start_pos + 594`; -let relay_log_space=`select 3*$binlog_start_pos + 652`; +let read_master_log_pos=`select $binlog_start_pos + 590`; +let relay_log_pos=`select 2*$binlog_start_pos + 634`; +let relay_log_space=`select 3*$binlog_start_pos + 696`; --replace_result $SERVER_MYPORT_1 MYPORT_1 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space <relay_log_space> show slave 'master1' status; --list_files $datadir mysqld* diff --git a/mysql-test/suite/multi_source/simple.test b/mysql-test/suite/multi_source/simple.test index c990a04acb0..8260686e927 100644 --- a/mysql-test/suite/multi_source/simple.test +++ b/mysql-test/suite/multi_source/simple.test @@ -41,10 +41,10 @@ let $condition = = 7; let $wait_for_all = 1; --source include/wait_show_condition.inc -let read_master_log_pos=`select $binlog_start_pos + 65`; -let relay_log_pos=`select 2*$binlog_start_pos + 105`; -let relay_log_space1=`select 3*$binlog_start_pos + 162`; -let relay_log_space2=`select 3*$binlog_start_pos + 162`; +let read_master_log_pos=`select $binlog_start_pos + 73`; +let relay_log_pos=`select 2*$binlog_start_pos + 117`; +let relay_log_space1=`select 3*$binlog_start_pos + 178`; +let relay_log_space2=`select 3*$binlog_start_pos + 178`; --replace_result $SERVER_MYPORT_1 MYPORT_1 $SERVER_MYPORT_2 MYPORT_2 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space1 <relay_log_space1> $relay_log_space2 <relay_log_space2> show all slaves status; |