diff options
| author | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2011-06-10 00:07:03 +0700 |
|---|---|---|
| committer | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2011-06-10 00:07:03 +0700 |
| commit | 1be4de546ea89a05babb94d9a95e3bce2fccf0f0 (patch) | |
| tree | 63a7c37a1ec59dfeb60718fa0d55eda1f8038628 /sql/event_parse_data.cc | |
| parent | 600647c7d8647dc31025146896a671619d73d97f (diff) | |
| parent | fa913a0b987d94164449511cf0cef5baf1fb9a6f (diff) | |
| download | mariadb-git-1be4de546ea89a05babb94d9a95e3bce2fccf0f0.tar.gz | |
Auto-merge of patch for bug#11764334 from mysql-5.1 tree.
Diffstat (limited to 'sql/event_parse_data.cc')
| -rw-r--r-- | sql/event_parse_data.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc index c36567fc8e1..d8c9847d0a0 100644 --- a/sql/event_parse_data.cc +++ b/sql/event_parse_data.cc @@ -48,9 +48,8 @@ Event_parse_data::new_instance(THD *thd) Event_parse_data::Event_parse_data() :on_completion(Event_parse_data::ON_COMPLETION_DEFAULT), - status(Event_parse_data::ENABLED), - do_not_create(FALSE), - body_changed(FALSE), + status(Event_parse_data::ENABLED), status_changed(false), + do_not_create(FALSE), body_changed(FALSE), item_starts(NULL), item_ends(NULL), item_execute_at(NULL), starts_null(TRUE), ends_null(TRUE), execute_at_null(TRUE), item_expression(NULL), expression(0) @@ -142,6 +141,7 @@ Event_parse_data::check_if_in_the_past(THD *thd, my_time_t ltime_utc) else if (status == Event_parse_data::ENABLED) { status= Event_parse_data::DISABLED; + status_changed= true; push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_EVENT_EXEC_TIME_IN_THE_PAST, ER(ER_EVENT_EXEC_TIME_IN_THE_PAST)); @@ -571,7 +571,10 @@ void Event_parse_data::check_originator_id(THD *thd) DBUG_PRINT("info", ("Invoked object status set to SLAVESIDE_DISABLED.")); if ((status == Event_parse_data::ENABLED) || (status == Event_parse_data::DISABLED)) - status = Event_parse_data::SLAVESIDE_DISABLED; + { + status= Event_parse_data::SLAVESIDE_DISABLED; + status_changed= true; + } originator = thd->server_id; } else |