diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:08:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:08:51 +0200 |
| commit | 9809f05199aeb0b67991fac41bd86f38730768dc (patch) | |
| tree | fa2792ff86d0da014b535d743759810612338042 /sql/events.h | |
| parent | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (diff) | |
| parent | 5a0e7394a5ae0c7b6a1ea35b7ea3a8985325987a (diff) | |
| download | mariadb-git-9809f05199aeb0b67991fac41bd86f38730768dc.tar.gz | |
5.5-merge
Diffstat (limited to 'sql/events.h')
| -rw-r--r-- | sql/events.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sql/events.h b/sql/events.h index 4cb93ce8415..a94fbc17135 100644 --- a/sql/events.h +++ b/sql/events.h @@ -26,8 +26,7 @@ */ #ifdef HAVE_PSI_INTERFACE -extern PSI_mutex_key key_LOCK_event_metadata, - key_event_scheduler_LOCK_scheduler_state; +extern PSI_mutex_key key_event_scheduler_LOCK_scheduler_state; extern PSI_cond_key key_event_scheduler_COND_state; extern PSI_thread_key key_thread_event_scheduler, key_thread_event_worker; #endif /* HAVE_PSI_INTERFACE */ @@ -43,19 +42,6 @@ struct TABLE_LIST; class THD; typedef class Item COND; -/* Return codes */ -enum enum_events_error_code -{ - OP_OK= 0, - OP_NOT_RUNNING, - OP_CANT_KILL, - OP_CANT_INIT, - OP_DISABLED_EVENT, - OP_LOAD_ERROR, - OP_ALREADY_EXISTS -}; - - int sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs); @@ -91,7 +77,6 @@ public: enum enum_opt_event_scheduler { EVENTS_OFF, EVENTS_ON, EVENTS_DISABLED }; /* Protected using LOCK_global_system_variables only. */ static ulong opt_event_scheduler; - static mysql_mutex_t LOCK_event_metadata; static bool check_if_system_tables_error(); static bool start(); static bool stop(); |