database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

manual merge

Browse Source 
mysql-test/r/events.result:
  Auto merged
sql/event.cc:
  Auto merged
sql/event_timed.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2006-04-07 09:18:29 +02:00
parent 040fc2d335 7c59699345
commit 3fe07e2785
11 changed files with 368 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/event.cc
View File

@ -1051,13 +1051,6 @@ evex_load_and_compile_event(THD * thd, sp_name *spn, LEX_STRING definer,
thd->restore_backup_open_tables_state(&backup);
if (ret)
goto done;
/*
allocate on evex_mem_root. if you call without evex_mem_root
then sphead will not be cleared!
*/
if ((ret= ett->compile(thd, &evex_mem_root)))
goto done;
ett->compute_next_execution_time();
if (use_lock)