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/extra | |
| 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/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_deadlock.test | 4 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_log.test | 6 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_row_charset.test | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_deadlock.test b/mysql-test/extra/rpl_tests/rpl_deadlock.test index 236a5f801b0..e9fde0aa8cc 100644 --- a/mysql-test/extra/rpl_tests/rpl_deadlock.test +++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test @@ -82,7 +82,7 @@ show slave status; stop slave; delete from t3; -change master to master_log_pos=544; # the BEGIN log event +change master to master_log_pos=547; # the BEGIN log event begin; select * from t2 for update; # hold lock start slave; @@ -107,7 +107,7 @@ set global max_relay_log_size=0; # This is really copy-paste of 2) of above stop slave; delete from t3; -change master to master_log_pos=544; +change master to master_log_pos=547; begin; select * from t2 for update; start slave; diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index cc3a9b4ffb5..4f40cab4e7e 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -42,13 +42,13 @@ select count(*) from t1; show binlog events; --replace_column 2 # 5 # --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ -show binlog events from 102 limit 1; +show binlog events from 105 limit 1; --replace_column 2 # 5 # --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ -show binlog events from 102 limit 2; +show binlog events from 105 limit 2; --replace_column 2 # 5 # --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ -show binlog events from 102 limit 2,1; +show binlog events from 105 limit 2,1; flush logs; # We need an extra update before doing save_master_pos. diff --git a/mysql-test/extra/rpl_tests/rpl_row_charset.test b/mysql-test/extra/rpl_tests/rpl_row_charset.test index 336a038db10..b3959c53d15 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_charset.test +++ b/mysql-test/extra/rpl_tests/rpl_row_charset.test @@ -115,7 +115,7 @@ drop database mysqltest2; drop database mysqltest3; --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; # Check that we can change global.collation_server (since 5.0.3) |