database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Upmerge 11762407 (54999) with additions

Browse Source
This commit is contained in:
Bjorn Munch
2011-02-23 12:54:58 +01:00
parent 562978e1ab 1f9d8cd862
commit fba6bdf989
80 changed files with 152 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/extra/rpl_tests/rpl_row_basic.test
View File

@ -382,6 +382,9 @@ source include/diff_tables.inc;
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, Error_code: 1677");
--let $rpl_only_running_threads= 1
--source include/rpl_reset.inc