diff options
| author | unknown <mats@romeo.(none)> | 2007-02-21 13:52:42 +0100 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-02-21 13:52:42 +0100 |
| commit | e1a360ad62b1800b6adc4b97c2604b59eea881d2 (patch) | |
| tree | 66f14587ebe96d0c8c501fb84d0831e9f4165fd0 /mysql-test/t/rpl_switch_stm_row_mixed.test | |
| parent | af71cac0e44da5e1671c9f8fca2cd4b99f9eb02e (diff) | |
| parent | e4146a9f7a9945ea8c5654fa9aba8ccdd05c6c4a (diff) | |
| download | mariadb-git-e1a360ad62b1800b6adc4b97c2604b59eea881d2.tar.gz | |
Merging with mysql-5.1-new-rpl
mysql-test/r/rpl_row_delayed_ins.result:
Manual merge.
Diffstat (limited to 'mysql-test/t/rpl_switch_stm_row_mixed.test')
| -rw-r--r-- | mysql-test/t/rpl_switch_stm_row_mixed.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/rpl_switch_stm_row_mixed.test b/mysql-test/t/rpl_switch_stm_row_mixed.test index bffa5905f1f..51075513c39 100644 --- a/mysql-test/t/rpl_switch_stm_row_mixed.test +++ b/mysql-test/t/rpl_switch_stm_row_mixed.test @@ -519,7 +519,7 @@ UNLOCK TABLES; --replace_column 2 # 5 # --replace_regex /table_id: [0-9]+/table_id: #/ -show binlog events from 102; +show binlog events from 105; sync_slave_with_master; # as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID @@ -536,7 +536,7 @@ sync_slave_with_master; connection master; --replace_column 2 # 5 # --replace_regex /table_id: [0-9]+/table_id: #/ -show binlog events from 102; +show binlog events from 105; # Now test that mysqlbinlog works fine on a binlog generated by the # mixed mode |