diff options
| author | Michael Widenius <monty@mysql.com> | 2008-10-10 18:28:41 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-10-10 18:28:41 +0300 |
| commit | f47e003e1bfc56c2bf5d0f144a35517f526b538b (patch) | |
| tree | e2bfb9834c6e558381465ed2f57a9d873a9b2c90 /sql/events.cc | |
| parent | 51a92bbb03cc58ab8688fa9d8226afe32e6156ca (diff) | |
| parent | 9daa56fd5ce3ccd33c32b5a505ac1d2b2c437460 (diff) | |
| download | mariadb-git-f47e003e1bfc56c2bf5d0f144a35517f526b538b.tar.gz | |
Merged 5.1 with maria 5.1
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/events.cc b/sql/events.cc index 309b6b1ac71..df49b7db773 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -860,6 +860,7 @@ Events::fill_schema_events(THD *thd, TABLE_LIST *tables, COND * /* cond */) bool Events::init(my_bool opt_noacl) { + THD *thd; bool res= FALSE; @@ -953,7 +954,6 @@ end: DBUG_RETURN(res); } - /* Cleans up scheduler's resources. Called at server shutdown. @@ -1148,7 +1148,7 @@ Events::load_events_from_db(THD *thd) DBUG_RETURN(TRUE); } - init_read_record(&read_record_info, thd, table, NULL, 0, 1); + init_read_record(&read_record_info, thd, table, NULL, 0, 1, FALSE); while (!(read_record_info.read_record(&read_record_info))) { Event_queue_element *et; @@ -1169,7 +1169,7 @@ Events::load_events_from_db(THD *thd) goto end; } drop_on_completion= (et->on_completion == - Event_queue_element::ON_COMPLETION_DROP); + Event_parse_data::ON_COMPLETION_DROP); if (event_queue->create_event(thd, et, &created)) |