diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-08-30 18:48:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-31 17:54:26 +0200 |
| commit | 059dfc187e3b51e06d941dc1ba539128c1b3de8c (patch) | |
| tree | 28b14fa874c491906a0060b71a0427d83c51f99c /mysql-test/extra | |
| parent | 6176b3477a0a7a20d09047e379c4c8b87c5e87b6 (diff) | |
| download | mariadb-git-wip-binlog-encryption.tar.gz | |
tests (temp)wip-binlog-encryption
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_deadlock.test | 2 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_row_annotate.test | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_deadlock.test b/mysql-test/extra/rpl_tests/rpl_deadlock.test index f7a1e71d5d9..40b3abd5273 100644 --- a/mysql-test/extra/rpl_tests/rpl_deadlock.test +++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test @@ -34,7 +34,7 @@ INSERT INTO t3 VALUES (3); COMMIT; save_master_pos; # Save BEGIN event into variable -let $master_pos_begin= query_get_value(SHOW BINLOG EVENTS, Pos, 10); +let $master_pos_begin= query_get_value(SHOW BINLOG EVENTS, Pos, 11); --echo # 1) Test deadlock diff --git a/mysql-test/extra/rpl_tests/rpl_row_annotate.test b/mysql-test/extra/rpl_tests/rpl_row_annotate.test index 0614ca97f1d..700f798ae21 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_annotate.test +++ b/mysql-test/extra/rpl_tests/rpl_row_annotate.test @@ -133,12 +133,7 @@ sync_slave_with_master; --echo ######################################################################## FLUSH LOGS; ---source include/binlog_start_pos.inc -let $start_pos= `select @binlog_start_pos`; ---replace_column 2 # 5 # ---replace_result $start_pos <start_pos> ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// ---eval show binlog events in 'slave-bin.000001' from $start_pos +--source include/show_binlog_events.inc --echo # --echo ######################################################################## |