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

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/rpl/r/rpl_rotate_logs.result
View File

@ -37,6 +37,7 @@ drop table temp_table, t3;
insert into t2 values(1234);
set insert_id=1234;
insert into t2 values(NULL);
call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .1234. for key .PRIMARY.. on query.* Error_code: 1062");
include/wait_for_slave_sql_error_and_skip.inc [errno=1062]
purge master logs to 'master-bin.000002';
show master logs;