diff options
| author | cbell/Chuck@mysql_cab_desk. <> | 2007-03-29 09:54:59 -0400 |
|---|---|---|
| committer | cbell/Chuck@mysql_cab_desk. <> | 2007-03-29 09:54:59 -0400 |
| commit | a591514a67796cdf81249751e17d24b505656f21 (patch) | |
| tree | b882e0f7e923a5f2e63a816eb86059d4de1a3abd /sql/event_queue.cc | |
| parent | f02726e72a3fe9b1813e4682da0a630ff55dd705 (diff) | |
| parent | 0627a31d7db9c38e1259f6f5b408058c7b53b52f (diff) | |
| download | mariadb-git-a591514a67796cdf81249751e17d24b505656f21.tar.gz | |
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
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 ef9dddf9195..b9c7af1a1a2 100644 --- a/sql/event_queue.cc +++ b/sql/event_queue.cc @@ -199,7 +199,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 { @@ -235,7 +236,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.")); /* |