database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-7635: Additional test fixes

Browse Source
This commit is contained in:
Elena Stepanova
2017-02-06 03:13:36 +02:00
committed by Nirbhay Choubey
parent c0209f8736
commit c513c4cbf5
22 changed files with 254 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/rpl/r/rpl_row_annotate_do.result
View File

@ -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