diff options
| author | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-03-29 08:38:06 -0400 |
|---|---|---|
| committer | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-03-29 08:38:06 -0400 |
| commit | 7e43b1f586142693a9b1ec1cf5ac92e6a38a3190 (patch) | |
| tree | 6fc1cd4dc0594454f29bec81426bc3befce3e345 /sql/event_queue.cc | |
| parent | 5de36f391f4d3f7fa75c0fdaf63f8469840c7b8b (diff) | |
| parent | 75686dc73f0e2d5af85a9cd77fccbf2896189a42 (diff) | |
| download | mariadb-git-7e43b1f586142693a9b1ec1cf5ac92e6a38a3190.tar.gz | |
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
into mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/event_queue.cc')
| -rw-r--r-- | sql/event_queue.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/event_queue.cc b/sql/event_queue.cc index fb1653d6d8f..4858becdf0d 100644 --- a/sql/event_queue.cc +++ b/sql/event_queue.cc @@ -197,7 +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 (new_element->status == Event_queue_element::DISABLED) + if ((new_element->status == Event_queue_element::DISABLED) + || (new_element->status == Event_queue_element::SLAVESIDE_DISABLED)) delete new_element; else { @@ -233,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.")); /* |