mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
f6834c02ca
duplicate key entries on slave" (two concurrrent connections doing multi-row INSERT DELAYED to insert into an auto_increment column, caused replication slave to stop with "duplicate key error" (and binlog was wrong)), and BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based binlogging breaks" (the binlog was not accounting for all rows inserted, or slave could stop). The fix is that: if (statement-based) binlogging is on, a multi-row INSERT DELAYED is silently converted to a non-delayed INSERT. Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap), so it is tested only in the changeset for 5.1. However, BUG#26116 is tested here, and the fix for BUG#25507 is the same code change. mysql-test/r/innodb-replace.result: result update mysql-test/t/innodb-replace.test: now that multi-row delayed inserts are converted to normal inserts if the statement-based binlog is enabled, no error is issued even if this engine does not support INSERT DELAYED, as the insert does not go through the INSERT DELAYED code. To preserve the goal of this test, we change the statements to single- row inserts. sql/sql_insert.cc: A multi-row INSERT DELAYED cannot be recorded to a statement-based binlog in a way that describes the insertions actually done; in that case we fallback to a non-delayed INSERT. mysql-test/r/rpl_insert_delayed.result: result. Master and slave match. mysql-test/t/rpl_insert_delayed.test: Test for BUG#26116 (see if one error at first row on master makes the slave's data incorrect, see if one error at second row on master makes slave stop).
67 lines
1.9 KiB
Text
67 lines
1.9 KiB
Text
--source include/master-slave.inc
|
|
--source include/not_embedded.inc
|
|
--source include/not_windows.inc
|
|
|
|
connection master;
|
|
|
|
let $binlog_format_statement=1;
|
|
|
|
CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64));
|
|
|
|
sync_slave_with_master;
|
|
|
|
#
|
|
# BUG#26116 "If multi-row INSERT DELAYED has errors,
|
|
# statement-based binlogging breaks";
|
|
# happened only in statement-based binlogging.
|
|
#
|
|
|
|
connection master;
|
|
truncate table t1;
|
|
# first scenario: duplicate on first row
|
|
insert delayed into t1 values(10, "my name");
|
|
if ($binlog_format_statement)
|
|
{
|
|
# statement below will be converted to non-delayed INSERT and so
|
|
# will stop at first error, guaranteeing replication.
|
|
--error ER_DUP_ENTRY
|
|
insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
|
|
}
|
|
if (!$binlog_format_statement)
|
|
{
|
|
insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
|
|
}
|
|
flush table t1; # to wait for INSERT DELAYED to be done
|
|
select * from t1;
|
|
sync_slave_with_master;
|
|
# when bug existed in statement-based binlogging, t1 on slave had
|
|
# different content from on master
|
|
select * from t1;
|
|
|
|
# second scenario: duplicate on second row
|
|
connection master;
|
|
delete from t1 where id!=10;
|
|
if ($binlog_format_statement)
|
|
{
|
|
# statement below will be converted to non-delayed INSERT and so
|
|
# will be binlogged with its ER_DUP_ENTRY error code, guaranteeing
|
|
# replication (slave will hit the same error code and so be fine).
|
|
--error ER_DUP_ENTRY
|
|
insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
|
|
}
|
|
if (!$binlog_format_statement)
|
|
{
|
|
insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
|
|
}
|
|
flush table t1; # to wait for INSERT DELAYED to be done
|
|
select * from t1;
|
|
sync_slave_with_master;
|
|
# when bug existed in statement-based binlogging, query was binlogged
|
|
# with error_code=0 so slave stopped
|
|
select * from t1;
|
|
|
|
# clean up
|
|
connection master;
|
|
drop table t1;
|
|
sync_slave_with_master;
|
|
connection master;
|