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/suite/rpl/r/rpl_row_annotate_do.result | |
| parent | c0209f87369538c1f321fede4c35be5473fae309 (diff) | |
| download | mariadb-git-c513c4cbf595ef949d7325988f3c250bcb52ab1b.tar.gz | |
MDEV-7635: Additional test fixes
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_row_annotate_do.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_annotate_do.result | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_row_annotate_do.result b/mysql-test/suite/rpl/r/rpl_row_annotate_do.result index 4cd3debf3f3..52f7b180fae 100644 --- a/mysql-test/suite/rpl/r/rpl_row_annotate_do.result +++ b/mysql-test/suite/rpl/r/rpl_row_annotate_do.result @@ -67,7 +67,7 @@ connection slave; include/wait_for_slave_sql_error.inc [errno=1032] Last_SQL_Error (expected "Delete_rows_v1 event on table test1.t3; Can't find record in 't3'" error) Could not execute Delete_rows_v1 event on table test1.t3; Can't find record in 't3', Error_code: 1032; handler error HA_ERR_END_OF_FILE; the event's master log master-bin.000002, end_log_pos END_LOG_POS -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; connection master; @@ -168,7 +168,7 @@ slave-bin.000001 # Table_map 1 # table_id: # (test1.t3) slave-bin.000001 # Write_rows_v1 1 # table_id: # flags: STMT_END_F slave-bin.000001 # Query 1 # COMMIT slave-bin.000001 # Gtid 2 # BEGIN GTID 0-2-27 -slave-bin.000001 # Annotate_rows 2 # INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Slave: Can\'t find record in \'t3\' Error_code: 1032' COLLATE 'latin1_swedish_ci')) +slave-bin.000001 # Annotate_rows 2 # INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Can\'t find record in \'t3\'' COLLATE 'latin1_swedish_ci')) slave-bin.000001 # Table_map 2 # table_id: # (mtr.test_suppressions) slave-bin.000001 # Write_rows_v1 2 # table_id: # flags: STMT_END_F slave-bin.000001 # Query 2 # COMMIT @@ -193,7 +193,4 @@ connection slave; ######################################################################## FLUSH LOGS; connection master; -use test; -connection slave; -call mtr.add_suppression("Can't find record in 't3'"); include/rpl_end.inc |