From 914ae41f3310d6fe8994a86b38930c1c3375dc0e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Feb 2007 15:53:14 +0100 Subject: Fix for 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 master. But the present bugfix, as it makes INSERT ON DUP KEY UPDATE behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34] master to a fixed (5.0.36) 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 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'll also ask for an alert to be put into the MySQL Network Monitoring and Advisory Service. mysql-test/r/rpl_insert_id.result: results to check the bugfix; without the bugfix, you would see, in master and slave: "3,2" instead of "2,2" for the INSERT VALUES testcase, "11,6,..." instead of "6,6,..." for the INSERT SELECT testcase. mysql-test/t/rpl_insert_id.test: testing that BUG#24432 is fixed sql/log_event.cc: A trick to force the master to pretend it is old and features BUG#24432. To do fast lookups in the list of known bugs by version, we compute the 3 X.Y.Z numbers from the master's version string and cache that into a new member Format_description_log_event::server_version_split. We do this computation in the event's two constructors. A simple prevention against buffer overrun when reading the master's version from a binlog event (assume the event is corrupted on disk, and so the version string on disk is longer than ST_SERVER_VER_LEN (50), then we would not get a closing 0 at the end of the class member. sql/log_event.h: new member to hold the "split server version" (3 numbers X.Y.Z), and a method to compute this from the version string. sql/slave.cc: a function which tells, based on master's version (as found in the Format_description event in the relay log being executed), if master can have a certain bug. This function uses a list of bug_id / first_version_with_bug / first_version_with_fix. If the test is positive, a short error message is put into SHOW SLAVE STATUS, and a verbose message is put into the slave's error log. The caller is expected to stop the slave in this case. sql/slave.h: new function to test if the replication master has a bug sql/sql_insert.cc: Fix for BUG#24432:t he reason was a misplaced restore_auto_increment() (misplaced when fixing BUG#20188). Indeed, when updating the row, it is clear that the autogenerated auto_increment value will not be used for this row (and if by "chance" the autoinc value present in the updated row is >= to the not used autogenerated value, adjust_next_insert_id_after_explicit_value() will fix next_insert_id). We also add code for a fixed slave to detect that it is connected to a buggy master (in which case it cannot replicate so stops). mysql-test/r/rpl_known_bugs_detection.result: see that SHOW SLAVE STATUS prints information that slave found a bug in master, and does not execute the dangerous event (table stays empty). mysql-test/t/rpl_known_bugs_detection-master.opt: pass debug symbol to make the master pretend it has BUG#24432 mysql-test/t/rpl_known_bugs_detection.test: new test to see if bug detection by slave works --- sql/slave.cc | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'sql/slave.cc') diff --git a/sql/slave.cc b/sql/slave.cc index 8805f950d50..37c782a42c3 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5165,6 +5165,70 @@ end: } +/** + Detects, based on master's version (as found in the relay log), if master + has a certain bug. + @param rli RELAY_LOG_INFO which tells the master's version + @param bug_id Number of the bug as found in bugs.mysql.com + @return TRUE if master has the bug, FALSE if it does not. +*/ +bool rpl_master_has_bug(RELAY_LOG_INFO *rli, uint bug_id) +{ + struct st_version_range_for_one_bug { + uint bug_id; + const uchar introduced_in[3]; // first version with bug + const uchar fixed_in[3]; // first version with fix + }; + static struct st_version_range_for_one_bug versions_for_all_bugs[]= + { + {24432, { 5, 0, 24 }, { 5, 0, 36 } }, + {24432, { 5, 1, 12 }, { 5, 1, 16 } } + }; + const uchar *master_ver= + rli->relay_log.description_event_for_exec->server_version_split; + + DBUG_ASSERT(sizeof(rli->relay_log.description_event_for_exec->server_version_split) == 3); + + for (uint i= 0; + i < sizeof(versions_for_all_bugs)/sizeof(*versions_for_all_bugs);i++) + { + const uchar *introduced_in= versions_for_all_bugs[i].introduced_in, + *fixed_in= versions_for_all_bugs[i].fixed_in; + if ((versions_for_all_bugs[i].bug_id == bug_id) && + (memcmp(introduced_in, master_ver, 3) <= 0) && + (memcmp(fixed_in, master_ver, 3) > 0)) + { + // a verbose message for the error log + slave_print_error(rli, ER_UNKNOWN_ERROR, + "According to the master's version ('%s')," + " it is probable that master suffers from this bug:" + " http://bugs.mysql.com/bug.php?id=%u" + " and thus replicating the current binary log event" + " may make the slave's data become different from the" + " master's data." + " To take no risk, slave refuses to replicate" + " this event and stops." + " We recommend that all updates be stopped on the" + " master and slave, that the data of both be" + " manually synchronized," + " that master's binary logs be deleted," + " that master be upgraded to a version at least" + " equal to '%d.%d.%d'. Then replication can be" + " restarted.", + rli->relay_log.description_event_for_exec->server_version, + bug_id, + fixed_in[0], fixed_in[1], fixed_in[2]); + // a short message for SHOW SLAVE STATUS (message length constraints) + my_printf_error(ER_UNKNOWN_ERROR, "master may suffer from" + " http://bugs.mysql.com/bug.php?id=%u" + " so slave stops; check error log on slave" + " for more info", MYF(0), bug_id); + return TRUE; + } + } + return FALSE; +} + #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION template class I_List_iterator; template class I_List_iterator; -- cgit v1.2.1 From 8c07265ce1444b0c6cf0d6938ef934ae7c9f8587 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Feb 2007 15:32:51 +0100 Subject: the fix for BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values" didn't make it into 5.0.36 and 5.1.16, so we need to adjust the bug-detection-based-on-version-number code. Because the rpl tree has a too old version, rpl_insert_id cannot pass, so I disable it (like is already the case in 5.1-rpl for the same reason), and the repl team will re-enable it when they merge 5.0 and 5.1 into their trees (thus getting the right version number). 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.0.38; we made the slave detect if it is connected to a <5.0.38 master and if so refuse to replicate. The problem is that this 5.0-rpl tree, even though it will produce the 5.0.38 release, still has a 5.0.36 version in configure.in. Thus rpl_insert_id fails. So I disable it. As soon as the 5.0-rpl tree gets the changesets from the main 5.0, its version will change to 5.0.38 and so the repl team will re-enable the test. sql/slave.cc: the fix for BUG#24432 didn't make it into 5.0.36 and 5.1.16, so we need to adjust the bug-detection-based-on-version-number code. --- sql/slave.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/slave.cc') diff --git a/sql/slave.cc b/sql/slave.cc index 37c782a42c3..f61d1e2ed69 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5181,8 +5181,8 @@ bool rpl_master_has_bug(RELAY_LOG_INFO *rli, uint bug_id) }; static struct st_version_range_for_one_bug versions_for_all_bugs[]= { - {24432, { 5, 0, 24 }, { 5, 0, 36 } }, - {24432, { 5, 1, 12 }, { 5, 1, 16 } } + {24432, { 5, 0, 24 }, { 5, 0, 38 } }, + {24432, { 5, 1, 12 }, { 5, 1, 17 } } }; const uchar *master_ver= rli->relay_log.description_event_for_exec->server_version_split; -- cgit v1.2.1