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

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  mysql.com:/home/my/mysql-5.1
This commit is contained in:
monty@nosik.monty.fi
2007-08-02 07:55:33 +03:00
parent 2459558060 4f33d95fa3
commit 93f0771fca
93 changed files with 1118 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/event_queue.cc
View File

@ -550,7 +550,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd,
top= ((Event_queue_element*) queue_element(&queue, 0));
thd->end_time(); /* Get current time */
thd->set_current_time(); /* Get current time */
next_activation_at= top->execute_at;
if (next_activation_at > thd->query_start())