diff options
| author | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-03-26 09:57:16 -0400 |
|---|---|---|
| committer | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-03-26 09:57:16 -0400 |
| commit | ff1d6b2252b8502596e2f7365b9935a4c3b59112 (patch) | |
| tree | eb834082bade798b379abe064b064f68b1949da4 /sql/event_queue.cc | |
| parent | 11aa04c993280023f46728f3ee57bf22a9adbb50 (diff) | |
| parent | 62b41b5fbcf3fe8bd680e28e0064d3194daf4157 (diff) | |
| download | mariadb-git-ff1d6b2252b8502596e2f7365b9935a4c3b59112.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
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
Auto merged
scripts/mysql_system_tables_fix.sql:
Auto merged
sql/event_data_objects.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/event_data_objects.h:
Manual merge.
sql/event_queue.cc:
Manual merge.
sql/events.cc:
Manual merge.
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 { |