mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki 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
commit c513c4cbf5
22 changed files with 250 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/extra/rpl_tests/create_recursive_construct.inc
View file

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

6
mysql-test/extra/rpl_tests/rpl_row_annotate.test
View file

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