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

Merge with MySQL 5.1.57/58

Browse Source 
Moved some BSD string functions from Unireg
This commit is contained in:
Michael Widenius
2011-05-02 20:58:45 +03:00
parent 046418ad95 a1f7ceb281
commit e415ba0fb2
538 changed files with 9630 additions and 3325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,7 +378,9 @@ INSERT INTO t3 VALUES (1, "", 1);
INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
connection slave;
# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
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");
--let $slave_sql_errno= 1535
--let $show_slave_sql_error= 1
--source include/wait_for_slave_sql_error.inc