diff options
author | Michael Widenius <monty@askmonty.org> | 2013-08-27 19:18:04 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-08-27 19:18:04 +0300 |
commit | 112411b056ae16c4addcb9dc84ebf1992b719d59 (patch) | |
tree | 0fa0c040903263e60a00f455afadaa9e83718736 /sql/rpl_utility.cc | |
parent | 7907b9b4da8c299318bd73d32b621dc34acc0f35 (diff) | |
download | mariadb-git-112411b056ae16c4addcb9dc84ebf1992b719d59.tar.gz |
Fixed MySQL bug #69861 LAST_INSERT_ID is replicated incorrectly if replication filters are used
mysql-test/suite/rpl/r/last_insert_id.result:
Test case for last_insert_id
mysql-test/suite/rpl/t/last_insert_id.cnf:
Test case for last_insert_id
mysql-test/suite/rpl/t/last_insert_id.test:
Test case for last_insert_id
sql/log_event.cc:
Added DBUG_PRINT
Set thd->first_successful_insert_id_in_prev_stmt_for_binlog when setting thd->first_successful_insert_id_in_prev_stmt.
This is required to get last_insert_id() replicated.
This is analog to how read_first_successful_insert_id_in_prev_stmt() works.
sql/rpl_utility.cc:
Added DBUG_PRINT
Diffstat (limited to 'sql/rpl_utility.cc')
-rw-r--r-- | sql/rpl_utility.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index ed6b9d13584..171112b09f0 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -1145,7 +1145,7 @@ bool Deferred_log_events::is_empty() bool Deferred_log_events::execute(Relay_log_info *rli) { bool res= false; - + DBUG_ENTER("Deferred_log_events::execute"); DBUG_ASSERT(rli->deferred_events_collecting); rli->deferred_events_collecting= false; @@ -1156,7 +1156,7 @@ bool Deferred_log_events::execute(Relay_log_info *rli) res= ev->apply_event(rli); } rli->deferred_events_collecting= true; - return res; + DBUG_RETURN(res); } void Deferred_log_events::rewind() |