summaryrefslogtreecommitdiff
path: root/sql/events.h
diff options
context:
space:
mode:
authorunknown <kostja@vajra.(none)>2007-04-05 20:47:22 +0400
committerunknown <kostja@vajra.(none)>2007-04-05 20:47:22 +0400
commitff452d050a78083b878260f8d2393016503ae0cb (patch)
tree8ca3fb500b914b5ecd4542a6d38a8a4c49bd22c1 /sql/events.h
parenta36054f4201568fac1717b451040ffa7925900a2 (diff)
downloadmariadb-git-ff452d050a78083b878260f8d2393016503ae0cb.tar.gz
Post-merge and post-review fixes for the patch for
Bug#23631 "Events: SHOW VARIABLES doesn't work when mysql.event is damaged: mysql-test/r/events.result: Update results (a post-merge fix) mysql-test/r/events_bugs.result: Update results (a post-merge fix) mysql-test/r/events_scheduling.result: Update results (a post-merge fix) mysql-test/t/events_scheduling.test: Make sure this test has no races. sql/event_data_objects.cc: Manual post-merge fix for the events replication patch. sql/event_data_objects.h: A post-merge fix. sql/event_db_repository.cc: A post-merge fix. sql/event_scheduler.cc: We should drop the event inside ::execute since there we have the right credentials to do so (otherwise Events::drop_event returns "access denied" error). sql/events.cc: A post-review fix for: rename start_or_stop_event_scheduler to switch_event_scheduler_state. sql/events.h: A post-review fix for: rename start_or_stop_event_scheduler to switch_event_scheduler_state. sql/set_var.cc: A post-review fix for: rename start_or_stop_event_scheduler to switch_event_scheduler_state. sql/sql_yacc.yy: Remove unused declaratoins.
Diffstat (limited to 'sql/events.h')
-rw-r--r--sql/events.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/events.h b/sql/events.h
index db0e947ab6c..1b99b072fd7 100644
--- a/sql/events.h
+++ b/sql/events.h
@@ -99,7 +99,7 @@ public:
destroy_mutexes();
static bool
- start_or_stop_event_scheduler(enum enum_opt_event_scheduler start_or_stop);
+ switch_event_scheduler_state(enum enum_opt_event_scheduler new_state);
static bool
create_event(THD *thd, Event_parse_data *parse_data, bool if_exists);