diff options
| author | cbell/Chuck@mysql_cab_desk. <> | 2007-03-29 08:17:19 -0400 |
|---|---|---|
| committer | cbell/Chuck@mysql_cab_desk. <> | 2007-03-29 08:17:19 -0400 |
| commit | 89838e1008ac1b175fd29b294408ee0e5b3ba702 (patch) | |
| tree | 157f613c7aa4768e5233e69907a9c1b9d8a61441 /sql/event_queue.cc | |
| parent | 71c4bd1f0add03542622e94c6d1394f6cbc48abc (diff) | |
| download | mariadb-git-89838e1008ac1b175fd29b294408ee0e5b3ba702.tar.gz | |
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.
Diffstat (limited to 'sql/event_queue.cc')
| -rw-r--r-- | sql/event_queue.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/event_queue.cc b/sql/event_queue.cc index c0f3166777c..4858becdf0d 100644 --- a/sql/event_queue.cc +++ b/sql/event_queue.cc @@ -197,8 +197,8 @@ Event_queue::create_event(THD *thd, Event_queue_element *new_element) DBUG_PRINT("enter", ("thd: 0x%lx et=%s.%s", (long) thd, new_element->dbname.str, new_element->name.str)); - if (res || new_element->status == Event_queue_element::DISABLED - || new_element->status == Event_queue_element::SLAVESIDE_DISABLED) + if ((new_element->status == Event_queue_element::DISABLED) + || (new_element->status == Event_queue_element::SLAVESIDE_DISABLED)) delete new_element; else { @@ -234,7 +234,8 @@ Event_queue::update_event(THD *thd, LEX_STRING dbname, LEX_STRING name, DBUG_ENTER("Event_queue::update_event"); DBUG_PRINT("enter", ("thd: 0x%lx et=[%s.%s]", (long) thd, dbname.str, name.str)); - if (new_element->status == Event_queue_element::DISABLED) + if ((new_element->status == Event_queue_element::DISABLED) || + (new_element->status == Event_queue_element::SLAVESIDE_DISABLED)) { DBUG_PRINT("info", ("The event is disabled.")); /* |