WL#3629 - Replication of Invocation and Invoked Features

This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct 
problems found during the recalculation of next execution of events in RBR.

1 files changed, 9 insertions, 1 deletions

diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index a639ff89fbe..7f54ac0dfe7 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -658,7 +658,8 @@ void Event_parse_data::check_originator_id(THD *thd)
       (thd->system_thread == SYSTEM_THREAD_SLAVE_IO))
   {
     DBUG_PRINT("info", ("Invoked object status set to SLAVESIDE_DISABLED."));
-    if (status == Event_basic::ENABLED)
+    if ((status == Event_basic::ENABLED) ||
+        (status == Event_basic::DISABLED))
       status = Event_basic::SLAVESIDE_DISABLED;
     originator = thd->server_id;
   }
@@ -1590,6 +1591,13 @@ Event_queue_element::update_timing_fields(THD *thd)
     status_changed= FALSE;
   }
 
+  /* 
+    Turn off row binlogging of event timing updates. These are not used
+    for RBR of events replicated to the slave.
+  */
+  if (thd->current_stmt_binlog_row_based)
+    thd->clear_current_stmt_binlog_row_based();
+
   if ((table->file->ha_update_row(table->record[1], table->record[0])))
     ret= TRUE;