diff options
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sql/events.cc b/sql/events.cc index afae512c61d..0f3fc8eee4a 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -319,7 +319,6 @@ common_1_lev_code: case INTERVAL_MICROSECOND: my_error(ER_NOT_SUPPORTED_YET, MYF(0), "MICROSECOND"); return 1; - break; case INTERVAL_QUARTER: expr/= 3; close_quote= FALSE; @@ -749,8 +748,7 @@ send_show_create_event(THD *thd, Event_timed *et, Protocol *protocol) field_list.push_back(new Item_empty_string("Event", NAME_CHAR_LEN)); - if (sys_var_thd_sql_mode::symbolic_mode_representation(thd, et->sql_mode, - &sql_mode)) + if (sys_var::make_set(thd, et->sql_mode, &sql_mode_typelib, &sql_mode)) DBUG_RETURN(TRUE); field_list.push_back(new Item_empty_string("sql_mode", (uint) sql_mode.length)); @@ -1058,7 +1056,12 @@ Events::deinit() void Events::init_mutexes() { - pthread_mutex_init(&LOCK_event_metadata, MY_MUTEX_INIT_FAST); + /* + Inconsisent usage between LOCK_event_metadata and LOCK_scheduler_state + and LOCK_open + */ + my_pthread_mutex_init(&LOCK_event_metadata, MY_MUTEX_INIT_FAST, + "LOCK_event_metadata", MYF_NO_DEADLOCK_DETECTION); } @@ -1262,8 +1265,9 @@ Events::load_events_from_db(THD *thd) } } } - sql_print_information("Event Scheduler: Loaded %d event%s", - count, (count == 1) ? "" : "s"); + if (global_system_variables.log_warnings) + sql_print_information("Event Scheduler: Loaded %d event%s", + count, (count == 1) ? "" : "s"); ret= FALSE; end: |