1 files changed, 1 insertions, 98 deletions
diff --git a/sql/event_data_objects.h b/sql/event_data_objects.h
index 7a49d1597d6..e32077b9c97 100644
--- a/sql/event_data_objects.h
+++ b/sql/event_data_objects.h
@@ -22,10 +22,7 @@
   @file event_data_objects.h
 */
 
-#define EVEX_GET_FIELD_FAILED   -2
-#define EVEX_BAD_PARAMS         -5
-#define EVEX_MICROSECOND_UNSUP  -6
-
+#include "event_parse_data.h"
 
 class Event_queue_element_for_exec
 {
@@ -54,23 +51,6 @@ protected:
   MEM_ROOT mem_root;
 
 public:
-  /*
-    ENABLED = feature can function normally (is turned on)
-    SLAVESIDE_DISABLED = feature is turned off on slave
-    DISABLED = feature is turned off
-  */
-  enum enum_status
-  {
-    ENABLED = 1,
-    DISABLED,
-    SLAVESIDE_DISABLED  
-  };
-
-  enum enum_on_completion
-  {
-    ON_COMPLETION_DROP = 1,
-    ON_COMPLETION_PRESERVE
-  };
 
   LEX_STRING dbname;
   LEX_STRING name;
@@ -201,83 +181,6 @@ private:
 };
 
 
-class Event_parse_data : public Sql_alloc
-{
-public:
-
-  int on_completion;
-  int status;
-  longlong originator;
-  /*
-    do_not_create will be set if STARTS time is in the past and
-    on_completion == ON_COMPLETION_DROP.
-  */
-  bool do_not_create;
-
-  bool body_changed;
-
-  LEX_STRING dbname;
-  LEX_STRING name;
-  LEX_STRING definer;// combination of user and host
-  LEX_STRING comment;
-
-  Item* item_starts;
-  Item* item_ends;
-  Item* item_execute_at;
-
-  my_time_t starts;
-  my_time_t ends;
-  my_time_t execute_at;
-  my_bool starts_null;
-  my_bool ends_null;
-  my_bool execute_at_null;
-
-  sp_name *identifier;
-  Item* item_expression;
-  longlong expression;
-  interval_type interval;
-
-  static Event_parse_data *
-  new_instance(THD *thd);
-
-  bool
-  check_parse_data(THD *thd);
-
-private:
-
-  void
-  init_definer(THD *thd);
-
-  void
-  init_name(THD *thd, sp_name *spn);
-
-  int
-  init_execute_at(THD *thd);
-
-  int
-  init_interval(THD *thd);
-
-  int
-  init_starts(THD *thd);
-
-  int
-  init_ends(THD *thd);
-
-  Event_parse_data();
-  ~Event_parse_data();
-
-  void
-  report_bad_value(const char *item_name, Item *bad_item);
-
-  void
-  check_if_in_the_past(THD *thd, my_time_t ltime_utc);
-
-  Event_parse_data(const Event_parse_data &);	/* Prevent use of these */
-  void check_originator_id(THD *thd);
-  void operator=(Event_parse_data &);
-};
-
-
 /* Compares only the schema part of the identifier */
 bool
 event_basic_db_equal(LEX_STRING db, Event_basic *et);