From b5932225d2397a91112ee8855faaff1d8a54413c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 Mar 2007 19:55:47 -0400 Subject: [PATCH] WL#3629 - Replication of Invocation and Invoked Features This patch adds code to the binlog calls for replication of the CREATE, DROP, and UPDATE event commands. An extra gate was added to ensure a query with length 0 is not binlogged. This corrects the problem of events_scheduling and rpl_events failing on some build machines. sql/events.cc: WL#3629 - Replication of Invocation and Invoked Features This patch adds code to the binlog calls for replication of the CREATE, DROP, and UPDATE event commands. An extra gate was added to ensure a query with length 0 is not binlogged. This corrects problems found when the patch for this worklog was pushed. --- sql/events.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/events.cc b/sql/events.cc index 5931c0a95d4..df2f1124f38 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -351,7 +351,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data, bool if_not_exists) else /* Binlog the create event. */ { event_queue->create_event(thd, new_element); - if (mysql_bin_log.is_open()) + if (mysql_bin_log.is_open() && (thd->query_length > 0)) { thd->clear_error(); thd->binlog_query(THD::MYSQL_QUERY_TYPE, @@ -426,7 +426,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data, sp_name *rename_to) { event_queue->update_event(thd, parse_data->dbname, parse_data->name, new_element); - if (mysql_bin_log.is_open()) + if (mysql_bin_log.is_open() && (thd->query_length > 0)) { thd->clear_error(); thd->binlog_query(THD::MYSQL_QUERY_TYPE, @@ -480,7 +480,7 @@ Events::drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name, bool if_exists) { event_queue->drop_event(thd, dbname, name); /* Binlog the drop event. */ - if (mysql_bin_log.is_open()) + if (mysql_bin_log.is_open() && (thd->query_length > 0)) { thd->clear_error(); thd->binlog_query(THD::MYSQL_QUERY_TYPE,