mariadb/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result

75 lines
1.7 KiB
Text
Raw Normal View History

Fix for BUG#25507 "multi-row insert delayed + auto increment causes 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).
2007-02-15 15:39:03 +01:00
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
Manual merge from 5.0-rpl, of fixes for: 1) BUG#25507 "multi-row insert delayed + auto increment causes 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: in statement-based binlogging, a multi-row INSERT DELAYED is silently converted to a non-delayed INSERT. This is supposed to not affect many 5.1 users as in 5.1, the default binlog format is "mixed", which does not have the bug (the bug is only with binlog_format=STATEMENT). We should document how the system delayed_insert thread decides of its binlog format (which is not modified by this patch): this decision is taken when the thread is created and holds until it is terminated (is not affected by any later change via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog format of the connection which issues INSERT DELAYED (this binlog format does not affect how the row will be binlogged). If one wants to change the binlog format of its server with SET GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all delayed_insert threads terminate and thus new threads are created, taking into account the new format. 2) BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values". When in an INSERT ON DUPLICATE KEY UPDATE, using an autoincrement column, we inserted some autogenerated values and also updated some rows, some autogenerated values were not used (for example, even if 10 was the largest autoinc value in the table at the start of the statement, 12 could be the first autogenerated value inserted by the statement, instead of 11). One autogenerated value was lost per updated row. Led to exhausting the range of the autoincrement column faster. Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12. This bug breaks replication from a pre-5.0.24/pre-5.1.12 master. But the present bugfix, as it makes INSERT ON DUP KEY UPDATE behave like pre-5.0.24/pre-5.1.12, breaks replication from a [5.0.24,5.0.34]/[5.1.12,5.1.15] master to a fixed (5.0.36/5.1.16) slave! To warn users against this when they upgrade their slave, as agreed with the support team, we add code for a fixed slave to detect that it is connected to a buggy master in a situation (INSERT ON DUP KEY UPDATE into autoinc column) likely to break replication, in which case it cannot replicate so stops and prints a message to the slave's error log and to SHOW SLAVE STATUS. For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15] replication we cannot warn as master does not know the slave's version (but we always recommended to users to have slave at least as new as master). As agreed with support, I have asked for an alert to be put into the MySQL Network Monitoring and Advisory Service. 3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets the changes from the main 5.1. BitKeeper/deleted/.del-rpl_insert_delayed.result: Delete: mysql-test/r/rpl_insert_delayed.result mysql-test/extra/rpl_tests/rpl_insert_delayed.test: tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc column and see if they cause duplicates) and BUG#26116 (see if one error at first row on master makes the slave's data incorrect). It is then incorporated into a statement-based and mixed binlogging test, and into a row-based test. It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed and extended to test BUG#25507. mysql-test/extra/rpl_tests/rpl_insert_id.test: manual merge of test for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" from 5.0 mysql-test/r/rpl_insert_id.result: result update (it automerged from 5.0, contrary to the test file) mysql-test/r/rpl_known_bugs_detection.result: result update (binlog event sizes differ from 5.0) mysql-test/t/disabled.def: rpl_insert_id tests statement-based replication of INSERT ON DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is fixed in 5.1.16; we made the slave detect if it is connected to a <5.1.16 master and if so refuse to replicate. The problem is that this 5.1-rpl tree, even though it will produce the 5.1.16 release, still has a 5.1.15 version in configure.in. Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl tree gets the changesets from the main 5.1, its version will change to 5.1.16 and so I'll be able to re-enable the test. mysql-test/t/rpl_known_bugs_detection.test: only in statement-based; row-based has no bug so test would fail. sql/slave.cc: slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR); so, for our my_printf_error(), which has a nicer message than this my_error(), to have any effect, it must be called before slave_print_msg() sql/sql_insert.cc: manual merge from 5.0 of a piece of the fixes for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" BUG#25507 "multi-row insert delayed + auto increment causes duplicate key entries on slave" BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based binlogging breaks". The other pieces (e.g. log_event.cc) automerged from 5.0. mysql-test/r/rpl_row_insert_delayed.result: result mysql-test/r/rpl_stm_insert_delayed.result: result. Note how "mixed" and "statement" insert different data in the table. mysql-test/t/rpl_row_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in row-based mode mysql-test/t/rpl_stm_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in statement-based and mixed mode
2007-02-15 20:28:58 +01:00
set @old_global_binlog_format = @@global.binlog_format;
set @@global.binlog_format = row;
CREATE SCHEMA IF NOT EXISTS mysqlslap;
USE mysqlslap;
select @@global.binlog_format;
@@global.binlog_format
ROW
Fix for BUG#25507 "multi-row insert delayed + auto increment causes 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).
2007-02-15 15:39:03 +01:00
CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64));
Manual merge from 5.0-rpl, of fixes for: 1) BUG#25507 "multi-row insert delayed + auto increment causes 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: in statement-based binlogging, a multi-row INSERT DELAYED is silently converted to a non-delayed INSERT. This is supposed to not affect many 5.1 users as in 5.1, the default binlog format is "mixed", which does not have the bug (the bug is only with binlog_format=STATEMENT). We should document how the system delayed_insert thread decides of its binlog format (which is not modified by this patch): this decision is taken when the thread is created and holds until it is terminated (is not affected by any later change via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog format of the connection which issues INSERT DELAYED (this binlog format does not affect how the row will be binlogged). If one wants to change the binlog format of its server with SET GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all delayed_insert threads terminate and thus new threads are created, taking into account the new format. 2) BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values". When in an INSERT ON DUPLICATE KEY UPDATE, using an autoincrement column, we inserted some autogenerated values and also updated some rows, some autogenerated values were not used (for example, even if 10 was the largest autoinc value in the table at the start of the statement, 12 could be the first autogenerated value inserted by the statement, instead of 11). One autogenerated value was lost per updated row. Led to exhausting the range of the autoincrement column faster. Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12. This bug breaks replication from a pre-5.0.24/pre-5.1.12 master. But the present bugfix, as it makes INSERT ON DUP KEY UPDATE behave like pre-5.0.24/pre-5.1.12, breaks replication from a [5.0.24,5.0.34]/[5.1.12,5.1.15] master to a fixed (5.0.36/5.1.16) slave! To warn users against this when they upgrade their slave, as agreed with the support team, we add code for a fixed slave to detect that it is connected to a buggy master in a situation (INSERT ON DUP KEY UPDATE into autoinc column) likely to break replication, in which case it cannot replicate so stops and prints a message to the slave's error log and to SHOW SLAVE STATUS. For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15] replication we cannot warn as master does not know the slave's version (but we always recommended to users to have slave at least as new as master). As agreed with support, I have asked for an alert to be put into the MySQL Network Monitoring and Advisory Service. 3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets the changes from the main 5.1. BitKeeper/deleted/.del-rpl_insert_delayed.result: Delete: mysql-test/r/rpl_insert_delayed.result mysql-test/extra/rpl_tests/rpl_insert_delayed.test: tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc column and see if they cause duplicates) and BUG#26116 (see if one error at first row on master makes the slave's data incorrect). It is then incorporated into a statement-based and mixed binlogging test, and into a row-based test. It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed and extended to test BUG#25507. mysql-test/extra/rpl_tests/rpl_insert_id.test: manual merge of test for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" from 5.0 mysql-test/r/rpl_insert_id.result: result update (it automerged from 5.0, contrary to the test file) mysql-test/r/rpl_known_bugs_detection.result: result update (binlog event sizes differ from 5.0) mysql-test/t/disabled.def: rpl_insert_id tests statement-based replication of INSERT ON DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is fixed in 5.1.16; we made the slave detect if it is connected to a <5.1.16 master and if so refuse to replicate. The problem is that this 5.1-rpl tree, even though it will produce the 5.1.16 release, still has a 5.1.15 version in configure.in. Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl tree gets the changesets from the main 5.1, its version will change to 5.1.16 and so I'll be able to re-enable the test. mysql-test/t/rpl_known_bugs_detection.test: only in statement-based; row-based has no bug so test would fail. sql/slave.cc: slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR); so, for our my_printf_error(), which has a nicer message than this my_error(), to have any effect, it must be called before slave_print_msg() sql/sql_insert.cc: manual merge from 5.0 of a piece of the fixes for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" BUG#25507 "multi-row insert delayed + auto increment causes duplicate key entries on slave" BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based binlogging breaks". The other pieces (e.g. log_event.cc) automerged from 5.0. mysql-test/r/rpl_row_insert_delayed.result: result mysql-test/r/rpl_stm_insert_delayed.result: result. Note how "mixed" and "statement" insert different data in the table. mysql-test/t/rpl_row_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in row-based mode mysql-test/t/rpl_stm_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in statement-based and mixed mode
2007-02-15 20:28:58 +01:00
FLUSH TABLE t1;
SELECT COUNT(*) FROM t1;
COUNT(*)
5000
use mysqlslap;
SELECT COUNT(*) FROM t1;
COUNT(*)
5000
Fix for BUG#25507 "multi-row insert delayed + auto increment causes 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).
2007-02-15 15:39:03 +01:00
truncate table t1;
insert delayed into t1 values(10, "my name");
insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
flush table t1;
select * from t1;
id name
10 my name
Manual merge from 5.0-rpl, of fixes for: 1) BUG#25507 "multi-row insert delayed + auto increment causes 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: in statement-based binlogging, a multi-row INSERT DELAYED is silently converted to a non-delayed INSERT. This is supposed to not affect many 5.1 users as in 5.1, the default binlog format is "mixed", which does not have the bug (the bug is only with binlog_format=STATEMENT). We should document how the system delayed_insert thread decides of its binlog format (which is not modified by this patch): this decision is taken when the thread is created and holds until it is terminated (is not affected by any later change via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog format of the connection which issues INSERT DELAYED (this binlog format does not affect how the row will be binlogged). If one wants to change the binlog format of its server with SET GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all delayed_insert threads terminate and thus new threads are created, taking into account the new format. 2) BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values". When in an INSERT ON DUPLICATE KEY UPDATE, using an autoincrement column, we inserted some autogenerated values and also updated some rows, some autogenerated values were not used (for example, even if 10 was the largest autoinc value in the table at the start of the statement, 12 could be the first autogenerated value inserted by the statement, instead of 11). One autogenerated value was lost per updated row. Led to exhausting the range of the autoincrement column faster. Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12. This bug breaks replication from a pre-5.0.24/pre-5.1.12 master. But the present bugfix, as it makes INSERT ON DUP KEY UPDATE behave like pre-5.0.24/pre-5.1.12, breaks replication from a [5.0.24,5.0.34]/[5.1.12,5.1.15] master to a fixed (5.0.36/5.1.16) slave! To warn users against this when they upgrade their slave, as agreed with the support team, we add code for a fixed slave to detect that it is connected to a buggy master in a situation (INSERT ON DUP KEY UPDATE into autoinc column) likely to break replication, in which case it cannot replicate so stops and prints a message to the slave's error log and to SHOW SLAVE STATUS. For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15] replication we cannot warn as master does not know the slave's version (but we always recommended to users to have slave at least as new as master). As agreed with support, I have asked for an alert to be put into the MySQL Network Monitoring and Advisory Service. 3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets the changes from the main 5.1. BitKeeper/deleted/.del-rpl_insert_delayed.result: Delete: mysql-test/r/rpl_insert_delayed.result mysql-test/extra/rpl_tests/rpl_insert_delayed.test: tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc column and see if they cause duplicates) and BUG#26116 (see if one error at first row on master makes the slave's data incorrect). It is then incorporated into a statement-based and mixed binlogging test, and into a row-based test. It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed and extended to test BUG#25507. mysql-test/extra/rpl_tests/rpl_insert_id.test: manual merge of test for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" from 5.0 mysql-test/r/rpl_insert_id.result: result update (it automerged from 5.0, contrary to the test file) mysql-test/r/rpl_known_bugs_detection.result: result update (binlog event sizes differ from 5.0) mysql-test/t/disabled.def: rpl_insert_id tests statement-based replication of INSERT ON DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is fixed in 5.1.16; we made the slave detect if it is connected to a <5.1.16 master and if so refuse to replicate. The problem is that this 5.1-rpl tree, even though it will produce the 5.1.16 release, still has a 5.1.15 version in configure.in. Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl tree gets the changesets from the main 5.1, its version will change to 5.1.16 and so I'll be able to re-enable the test. mysql-test/t/rpl_known_bugs_detection.test: only in statement-based; row-based has no bug so test would fail. sql/slave.cc: slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR); so, for our my_printf_error(), which has a nicer message than this my_error(), to have any effect, it must be called before slave_print_msg() sql/sql_insert.cc: manual merge from 5.0 of a piece of the fixes for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" BUG#25507 "multi-row insert delayed + auto increment causes duplicate key entries on slave" BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based binlogging breaks". The other pieces (e.g. log_event.cc) automerged from 5.0. mysql-test/r/rpl_row_insert_delayed.result: result mysql-test/r/rpl_stm_insert_delayed.result: result. Note how "mixed" and "statement" insert different data in the table. mysql-test/t/rpl_row_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in row-based mode mysql-test/t/rpl_stm_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in statement-based and mixed mode
2007-02-15 20:28:58 +01:00
20 James Bond
Fix for BUG#25507 "multi-row insert delayed + auto increment causes 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).
2007-02-15 15:39:03 +01:00
select * from t1;
id name
10 my name
Manual merge from 5.0-rpl, of fixes for: 1) BUG#25507 "multi-row insert delayed + auto increment causes 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: in statement-based binlogging, a multi-row INSERT DELAYED is silently converted to a non-delayed INSERT. This is supposed to not affect many 5.1 users as in 5.1, the default binlog format is "mixed", which does not have the bug (the bug is only with binlog_format=STATEMENT). We should document how the system delayed_insert thread decides of its binlog format (which is not modified by this patch): this decision is taken when the thread is created and holds until it is terminated (is not affected by any later change via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog format of the connection which issues INSERT DELAYED (this binlog format does not affect how the row will be binlogged). If one wants to change the binlog format of its server with SET GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all delayed_insert threads terminate and thus new threads are created, taking into account the new format. 2) BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values". When in an INSERT ON DUPLICATE KEY UPDATE, using an autoincrement column, we inserted some autogenerated values and also updated some rows, some autogenerated values were not used (for example, even if 10 was the largest autoinc value in the table at the start of the statement, 12 could be the first autogenerated value inserted by the statement, instead of 11). One autogenerated value was lost per updated row. Led to exhausting the range of the autoincrement column faster. Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12. This bug breaks replication from a pre-5.0.24/pre-5.1.12 master. But the present bugfix, as it makes INSERT ON DUP KEY UPDATE behave like pre-5.0.24/pre-5.1.12, breaks replication from a [5.0.24,5.0.34]/[5.1.12,5.1.15] master to a fixed (5.0.36/5.1.16) slave! To warn users against this when they upgrade their slave, as agreed with the support team, we add code for a fixed slave to detect that it is connected to a buggy master in a situation (INSERT ON DUP KEY UPDATE into autoinc column) likely to break replication, in which case it cannot replicate so stops and prints a message to the slave's error log and to SHOW SLAVE STATUS. For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15] replication we cannot warn as master does not know the slave's version (but we always recommended to users to have slave at least as new as master). As agreed with support, I have asked for an alert to be put into the MySQL Network Monitoring and Advisory Service. 3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets the changes from the main 5.1. BitKeeper/deleted/.del-rpl_insert_delayed.result: Delete: mysql-test/r/rpl_insert_delayed.result mysql-test/extra/rpl_tests/rpl_insert_delayed.test: tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc column and see if they cause duplicates) and BUG#26116 (see if one error at first row on master makes the slave's data incorrect). It is then incorporated into a statement-based and mixed binlogging test, and into a row-based test. It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed and extended to test BUG#25507. mysql-test/extra/rpl_tests/rpl_insert_id.test: manual merge of test for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" from 5.0 mysql-test/r/rpl_insert_id.result: result update (it automerged from 5.0, contrary to the test file) mysql-test/r/rpl_known_bugs_detection.result: result update (binlog event sizes differ from 5.0) mysql-test/t/disabled.def: rpl_insert_id tests statement-based replication of INSERT ON DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is fixed in 5.1.16; we made the slave detect if it is connected to a <5.1.16 master and if so refuse to replicate. The problem is that this 5.1-rpl tree, even though it will produce the 5.1.16 release, still has a 5.1.15 version in configure.in. Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl tree gets the changesets from the main 5.1, its version will change to 5.1.16 and so I'll be able to re-enable the test. mysql-test/t/rpl_known_bugs_detection.test: only in statement-based; row-based has no bug so test would fail. sql/slave.cc: slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR); so, for our my_printf_error(), which has a nicer message than this my_error(), to have any effect, it must be called before slave_print_msg() sql/sql_insert.cc: manual merge from 5.0 of a piece of the fixes for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" BUG#25507 "multi-row insert delayed + auto increment causes duplicate key entries on slave" BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based binlogging breaks". The other pieces (e.g. log_event.cc) automerged from 5.0. mysql-test/r/rpl_row_insert_delayed.result: result mysql-test/r/rpl_stm_insert_delayed.result: result. Note how "mixed" and "statement" insert different data in the table. mysql-test/t/rpl_row_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in row-based mode mysql-test/t/rpl_stm_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in statement-based and mixed mode
2007-02-15 20:28:58 +01:00
20 James Bond
Fix for BUG#25507 "multi-row insert delayed + auto increment causes 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).
2007-02-15 15:39:03 +01:00
delete from t1 where id!=10;
insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
flush table t1;
select * from t1;
id name
10 my name
20 is Bond
select * from t1;
id name
10 my name
20 is Bond
Manual merge from 5.0-rpl, of fixes for: 1) BUG#25507 "multi-row insert delayed + auto increment causes 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: in statement-based binlogging, a multi-row INSERT DELAYED is silently converted to a non-delayed INSERT. This is supposed to not affect many 5.1 users as in 5.1, the default binlog format is "mixed", which does not have the bug (the bug is only with binlog_format=STATEMENT). We should document how the system delayed_insert thread decides of its binlog format (which is not modified by this patch): this decision is taken when the thread is created and holds until it is terminated (is not affected by any later change via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog format of the connection which issues INSERT DELAYED (this binlog format does not affect how the row will be binlogged). If one wants to change the binlog format of its server with SET GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all delayed_insert threads terminate and thus new threads are created, taking into account the new format. 2) BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values". When in an INSERT ON DUPLICATE KEY UPDATE, using an autoincrement column, we inserted some autogenerated values and also updated some rows, some autogenerated values were not used (for example, even if 10 was the largest autoinc value in the table at the start of the statement, 12 could be the first autogenerated value inserted by the statement, instead of 11). One autogenerated value was lost per updated row. Led to exhausting the range of the autoincrement column faster. Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12. This bug breaks replication from a pre-5.0.24/pre-5.1.12 master. But the present bugfix, as it makes INSERT ON DUP KEY UPDATE behave like pre-5.0.24/pre-5.1.12, breaks replication from a [5.0.24,5.0.34]/[5.1.12,5.1.15] master to a fixed (5.0.36/5.1.16) slave! To warn users against this when they upgrade their slave, as agreed with the support team, we add code for a fixed slave to detect that it is connected to a buggy master in a situation (INSERT ON DUP KEY UPDATE into autoinc column) likely to break replication, in which case it cannot replicate so stops and prints a message to the slave's error log and to SHOW SLAVE STATUS. For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15] replication we cannot warn as master does not know the slave's version (but we always recommended to users to have slave at least as new as master). As agreed with support, I have asked for an alert to be put into the MySQL Network Monitoring and Advisory Service. 3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets the changes from the main 5.1. BitKeeper/deleted/.del-rpl_insert_delayed.result: Delete: mysql-test/r/rpl_insert_delayed.result mysql-test/extra/rpl_tests/rpl_insert_delayed.test: tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc column and see if they cause duplicates) and BUG#26116 (see if one error at first row on master makes the slave's data incorrect). It is then incorporated into a statement-based and mixed binlogging test, and into a row-based test. It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed and extended to test BUG#25507. mysql-test/extra/rpl_tests/rpl_insert_id.test: manual merge of test for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" from 5.0 mysql-test/r/rpl_insert_id.result: result update (it automerged from 5.0, contrary to the test file) mysql-test/r/rpl_known_bugs_detection.result: result update (binlog event sizes differ from 5.0) mysql-test/t/disabled.def: rpl_insert_id tests statement-based replication of INSERT ON DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is fixed in 5.1.16; we made the slave detect if it is connected to a <5.1.16 master and if so refuse to replicate. The problem is that this 5.1-rpl tree, even though it will produce the 5.1.16 release, still has a 5.1.15 version in configure.in. Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl tree gets the changesets from the main 5.1, its version will change to 5.1.16 and so I'll be able to re-enable the test. mysql-test/t/rpl_known_bugs_detection.test: only in statement-based; row-based has no bug so test would fail. sql/slave.cc: slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR); so, for our my_printf_error(), which has a nicer message than this my_error(), to have any effect, it must be called before slave_print_msg() sql/sql_insert.cc: manual merge from 5.0 of a piece of the fixes for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" BUG#25507 "multi-row insert delayed + auto increment causes duplicate key entries on slave" BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based binlogging breaks". The other pieces (e.g. log_event.cc) automerged from 5.0. mysql-test/r/rpl_row_insert_delayed.result: result mysql-test/r/rpl_stm_insert_delayed.result: result. Note how "mixed" and "statement" insert different data in the table. mysql-test/t/rpl_row_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in row-based mode mysql-test/t/rpl_stm_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in statement-based and mixed mode
2007-02-15 20:28:58 +01:00
USE test;
DROP SCHEMA mysqlslap;
use test;
FLUSH LOGS;
FLUSH LOGS;
CREATE TABLE t1(a int, UNIQUE(a));
INSERT DELAYED IGNORE INTO t1 VALUES(1);
INSERT DELAYED IGNORE INTO t1 VALUES(1);
flush table t1;
show binlog events in 'master-bin.000002' LIMIT 2,2;
Log_name Pos Event_type Server_id End_log_pos Info
x x x x x table_id: 23 (test.t1)
x x x x x table_id: 23 flags: STMT_END_F
select * from t1;
a
1
On slave
show binlog events in 'slave-bin.000002' LIMIT 2,2;
Log_name Pos Event_type Server_id End_log_pos Info
x x x x x table_id: 23 (test.t1)
x x x x x table_id: 23 flags: STMT_END_F
select * from t1;
a
1
drop table t1;
FLUSH LOGS;
FLUSH LOGS;
End of 5.0 tests
Manual merge from 5.0-rpl, of fixes for: 1) BUG#25507 "multi-row insert delayed + auto increment causes 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: in statement-based binlogging, a multi-row INSERT DELAYED is silently converted to a non-delayed INSERT. This is supposed to not affect many 5.1 users as in 5.1, the default binlog format is "mixed", which does not have the bug (the bug is only with binlog_format=STATEMENT). We should document how the system delayed_insert thread decides of its binlog format (which is not modified by this patch): this decision is taken when the thread is created and holds until it is terminated (is not affected by any later change via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog format of the connection which issues INSERT DELAYED (this binlog format does not affect how the row will be binlogged). If one wants to change the binlog format of its server with SET GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all delayed_insert threads terminate and thus new threads are created, taking into account the new format. 2) BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values". When in an INSERT ON DUPLICATE KEY UPDATE, using an autoincrement column, we inserted some autogenerated values and also updated some rows, some autogenerated values were not used (for example, even if 10 was the largest autoinc value in the table at the start of the statement, 12 could be the first autogenerated value inserted by the statement, instead of 11). One autogenerated value was lost per updated row. Led to exhausting the range of the autoincrement column faster. Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12. This bug breaks replication from a pre-5.0.24/pre-5.1.12 master. But the present bugfix, as it makes INSERT ON DUP KEY UPDATE behave like pre-5.0.24/pre-5.1.12, breaks replication from a [5.0.24,5.0.34]/[5.1.12,5.1.15] master to a fixed (5.0.36/5.1.16) slave! To warn users against this when they upgrade their slave, as agreed with the support team, we add code for a fixed slave to detect that it is connected to a buggy master in a situation (INSERT ON DUP KEY UPDATE into autoinc column) likely to break replication, in which case it cannot replicate so stops and prints a message to the slave's error log and to SHOW SLAVE STATUS. For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15] replication we cannot warn as master does not know the slave's version (but we always recommended to users to have slave at least as new as master). As agreed with support, I have asked for an alert to be put into the MySQL Network Monitoring and Advisory Service. 3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets the changes from the main 5.1. BitKeeper/deleted/.del-rpl_insert_delayed.result: Delete: mysql-test/r/rpl_insert_delayed.result mysql-test/extra/rpl_tests/rpl_insert_delayed.test: tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc column and see if they cause duplicates) and BUG#26116 (see if one error at first row on master makes the slave's data incorrect). It is then incorporated into a statement-based and mixed binlogging test, and into a row-based test. It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed and extended to test BUG#25507. mysql-test/extra/rpl_tests/rpl_insert_id.test: manual merge of test for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" from 5.0 mysql-test/r/rpl_insert_id.result: result update (it automerged from 5.0, contrary to the test file) mysql-test/r/rpl_known_bugs_detection.result: result update (binlog event sizes differ from 5.0) mysql-test/t/disabled.def: rpl_insert_id tests statement-based replication of INSERT ON DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is fixed in 5.1.16; we made the slave detect if it is connected to a <5.1.16 master and if so refuse to replicate. The problem is that this 5.1-rpl tree, even though it will produce the 5.1.16 release, still has a 5.1.15 version in configure.in. Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl tree gets the changesets from the main 5.1, its version will change to 5.1.16 and so I'll be able to re-enable the test. mysql-test/t/rpl_known_bugs_detection.test: only in statement-based; row-based has no bug so test would fail. sql/slave.cc: slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR); so, for our my_printf_error(), which has a nicer message than this my_error(), to have any effect, it must be called before slave_print_msg() sql/sql_insert.cc: manual merge from 5.0 of a piece of the fixes for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" BUG#25507 "multi-row insert delayed + auto increment causes duplicate key entries on slave" BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based binlogging breaks". The other pieces (e.g. log_event.cc) automerged from 5.0. mysql-test/r/rpl_row_insert_delayed.result: result mysql-test/r/rpl_stm_insert_delayed.result: result. Note how "mixed" and "statement" insert different data in the table. mysql-test/t/rpl_row_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in row-based mode mysql-test/t/rpl_stm_insert_delayed.test: wrapper to test INSERT DELAYED binlogging in statement-based and mixed mode
2007-02-15 20:28:58 +01:00
set @@global.binlog_format = @old_global_binlog_format;