summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.cc
diff options
context:
space:
mode:
authorAndrei Elkin <andrei.elkin@oracle.com>2012-04-20 19:41:20 +0300
committerAndrei Elkin <andrei.elkin@oracle.com>2012-04-20 19:41:20 +0300
commitf3509d1d67281af248988e117027c67667dae65c (patch)
treebb5c1d632c90bb4f7042bf18cfd4e1ab0c74a921 /sql/rpl_rli.cc
parent5203d9bb98bc4696b916317045216de1ee55c663 (diff)
downloadmariadb-git-f3509d1d67281af248988e117027c67667dae65c.tar.gz
BUG#11754117 incorrect logging of INSERT into auto-increment
BUG#11761686 insert_id event is not filtered. Two issues are covered. INSERT into autoincrement field which is not the first part in the composed primary key is unsafe by autoincrement logging design. The case is specific to MyISAM engine because Innodb does not allow such table definition. However no warnings and row-format logging in the MIXED mode was done, and that is fixed. Int-, Rand-, User-var log-events were not filtered along with their parent query that made possible them to screw up execution context of the following query. Fixed with deferring their execution until the parent query. ****** Bug#11754117 Post review fixes.
Diffstat (limited to 'sql/rpl_rli.cc')
-rw-r--r--sql/rpl_rli.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 6fe4cbd4ea6..904b5533f3b 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -45,7 +45,9 @@ Relay_log_info::Relay_log_info()
inited(0), abort_slave(0), slave_running(0), until_condition(UNTIL_NONE),
until_log_pos(0), retried_trans(0),
tables_to_lock(0), tables_to_lock_count(0),
- last_event_start_time(0), m_flags(0)
+ last_event_start_time(0),
+ deferred_events(NULL),
+ m_flags(0)
{
DBUG_ENTER("Relay_log_info::Relay_log_info");