diff options
| author | cbell/Chuck@mysql_cab_desk. <> | 2007-03-26 09:57:16 -0400 |
|---|---|---|
| committer | cbell/Chuck@mysql_cab_desk. <> | 2007-03-26 09:57:16 -0400 |
| commit | 71c4bd1f0add03542622e94c6d1394f6cbc48abc (patch) | |
| tree | eb834082bade798b379abe064b064f68b1949da4 /sql/event_queue.cc | |
| parent | 68cc7dde31b6cf1a72fea3e3e6d3aa62bd3bacf9 (diff) | |
| parent | 3e44599c11e90c2b6470e64dbe6d78bc6c5f9f10 (diff) | |
| download | mariadb-git-71c4bd1f0add03542622e94c6d1394f6cbc48abc.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
Diffstat (limited to 'sql/event_queue.cc')
| -rw-r--r-- | sql/event_queue.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/event_queue.cc b/sql/event_queue.cc index fb1653d6d8f..c0f3166777c 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 (res || new_element->status == Event_queue_element::DISABLED + || new_element->status == Event_queue_element::SLAVESIDE_DISABLED) delete new_element; else { |