database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +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 2c4f6e5c63 8b3f956020
commit b027d10438
80 changed files with 152 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog/r/binlog_stm_binlog.result
View File

@ -864,6 +864,7 @@ unique_checks OFF
# INSERT INTO t1 VALUES(2)
# foreign_key_checks=1 and unique_checks=1
# It should not change current session's variables, even error happens
call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062");
BINLOG '
dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE=
dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==