Commit 4f2d6f11 authored by unknown's avatar unknown

fix for bug #16411 (Microseconds are allowed for events)


sql/event_timed.cc:
  fix problem during merge
parent d7d068ea
...@@ -1278,7 +1278,6 @@ event_timed::compile(THD *thd, MEM_ROOT *mem_root) ...@@ -1278,7 +1278,6 @@ event_timed::compile(THD *thd, MEM_ROOT *mem_root)
thd->update_charset(); thd->update_charset();
DBUG_ENTER("event_timed::compile");
DBUG_PRINT("info",("old_sql_mode=%d new_sql_mode=%d",old_sql_mode, sql_mode)); DBUG_PRINT("info",("old_sql_mode=%d new_sql_mode=%d",old_sql_mode, sql_mode));
thd->variables.sql_mode= this->sql_mode; thd->variables.sql_mode= this->sql_mode;
/* Change the memory root for the execution time */ /* Change the memory root for the execution time */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment