diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-02-06 03:13:36 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-10 06:30:42 -0500 |
| commit | c513c4cbf595ef949d7325988f3c250bcb52ab1b (patch) | |
| tree | 9918b1d3a233c3e1aa2b341a06ed9ce0cb38e1d1 /mysql-test/extra | |
| parent | c0209f87369538c1f321fede4c35be5473fae309 (diff) | |
| download | mariadb-git-c513c4cbf595ef949d7325988f3c250bcb52ab1b.tar.gz | |
MDEV-7635: Additional test fixes
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/create_recursive_construct.inc | 5 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_row_annotate.test | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mysql-test/extra/rpl_tests/create_recursive_construct.inc b/mysql-test/extra/rpl_tests/create_recursive_construct.inc index 90a62d8f624..b7405aa4c7f 100644 --- a/mysql-test/extra/rpl_tests/create_recursive_construct.inc +++ b/mysql-test/extra/rpl_tests/create_recursive_construct.inc @@ -357,8 +357,9 @@ if ($CRC_RET_stmt_sidef) { SHOW BINLOG EVENTS; --die Wrong events in binlog. } - # The first event is format_description, the second is Binlog_checkpoint, - # the third is Query_event('BEGIN'), and the fourth should be our Table_map + # The first event is format_description, the second is Gtid list, + # the third is Binlog_checkpoint, the fourth is Query_event('BEGIN'), + # the fifth is Annotate_rows, and the sixth should be our Table_map # for unsafe statement. if (`SELECT $unsafe_type != 3 AND '$event_type' != 'Table_map'`) { --enable_query_log diff --git a/mysql-test/extra/rpl_tests/rpl_row_annotate.test b/mysql-test/extra/rpl_tests/rpl_row_annotate.test index b7ab4f4eade..317a9c86539 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_annotate.test +++ b/mysql-test/extra/rpl_tests/rpl_row_annotate.test @@ -123,7 +123,7 @@ source include/wait_for_slave_sql_error.inc; --disable_query_log --eval SELECT "$err" as 'Last_SQL_Error (expected "Delete_rows_v1 event on table test1.t3; Can\'t find record in \'t3\'" error)' --enable_query_log -call mtr.add_suppression("Slave: Can't find record in 't3' Error_code: 1032"); +call mtr.add_suppression("Can't find record in 't3'"); SET GLOBAL sql_slave_skip_counter=1; START SLAVE; @@ -182,8 +182,4 @@ DROP DATABASE test1; sync_slave_with_master; --enable_query_log -use test; -connection slave; -call mtr.add_suppression("Can't find record in 't3'"); - --source include/rpl_end.inc |