1 files changed, 13 insertions, 23 deletions

diff --git a/sql/events.h b/sql/events.h
index 2bc87517748..8f68d5a8029 100644
--- a/sql/events.h
+++ b/sql/events.h
@@ -56,7 +56,7 @@ sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);
   The life cycle of the Events module is the following:
 
   At server start up:
-     set_opt_event_scheduler() -> init_mutexes() -> init()
+     init_mutexes() -> init()
   When the server is running:
      create_event(), drop_event(), start_or_stop_event_scheduler(), etc
   At shutdown:
@@ -70,23 +70,19 @@ sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);
 class Events
 {
 public:
-  /* The order should match the order in opt_typelib */
-  enum enum_opt_event_scheduler
-  {
-    EVENTS_OFF= 0,
-    EVENTS_ON= 1,
-    EVENTS_DISABLED= 4
-  };
-
-  /* Possible values of @@event_scheduler variable */
-  static const TYPELIB var_typelib;
-
-  static bool
-  set_opt_event_scheduler(char *argument);
-
-  static const char *
-  get_opt_event_scheduler_str();
+  /*
+    the following block is to support --event-scheduler command line option
+    and the @@global.event_scheduler SQL variable.
+    See sys_var.cc
+  */
+  enum enum_opt_event_scheduler { EVENTS_OFF, EVENTS_ON, EVENTS_DISABLED };
+  static uint opt_event_scheduler;
+  static pthread_mutex_t LOCK_event_metadata;
+  static bool check_if_system_tables_error();
+  static bool start();
+  static bool stop();
 
+public:
   /* A hack needed for Event_queue_element */
   static Event_db_repository *
   get_db_repository() { return db_repository; }
@@ -134,20 +130,14 @@ public:
   dump_internal_status();
 
 private:
-  static bool check_if_system_tables_error();
 
   static bool
   load_events_from_db(THD *thd);
 
 private:
-  /* Command line option names */
-  static const TYPELIB opt_typelib;
-  static pthread_mutex_t LOCK_event_metadata;
   static Event_queue         *event_queue;
   static Event_scheduler     *scheduler;
   static Event_db_repository *db_repository;
-  /* Current state of Event Scheduler */
-  static enum enum_opt_event_scheduler opt_event_scheduler;
   /* Set to TRUE if an error at start up */
   static bool check_system_tables_error;