summaryrefslogtreecommitdiff
path: root/sql/events.cc
diff options
context:
space:
mode:
authorcbell/Chuck@mysql_cab_desk. <>2007-03-29 19:55:47 -0400
committercbell/Chuck@mysql_cab_desk. <>2007-03-29 19:55:47 -0400
commit10dd347612eb6679b24b3ddb2814149c2c03b6a3 (patch)
tree2d447956c5320c17f68d1b5cdfa0d4c26dedc070 /sql/events.cc
parentb41603e6b913d50b897c1a157f1cc6947134efec (diff)
downloadmariadb-git-10dd347612eb6679b24b3ddb2814149c2c03b6a3.tar.gz
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.
Diffstat (limited to 'sql/events.cc')
-rw-r--r--sql/events.cc6
1 files 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,