diff options
| author | unknown <monty@nosik.monty.fi> | 2007-08-02 07:55:33 +0300 |
|---|---|---|
| committer | unknown <monty@nosik.monty.fi> | 2007-08-02 07:55:33 +0300 |
| commit | 8433e9687dc6b7474e54ea6b9e54875946f4bd13 (patch) | |
| tree | 5c544cc45c47bbd06c8b4d216aab02fe9307f8de /sql/event_queue.cc | |
| parent | 80584169c2d4d3a66afdb3e886df0c6b25366061 (diff) | |
| parent | 0c4768f342c989ba09a9eefc1bb99fffc2c6bee6 (diff) | |
| download | mariadb-git-8433e9687dc6b7474e54ea6b9e54875946f4bd13.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
client/client_priv.h:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlslap.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/event_data_objects.cc:
Auto merged
sql/event_queue.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_cache.cc:
Manual merge
Removed comment about bug in old code (not relevant)
Diffstat (limited to 'sql/event_queue.cc')
| -rw-r--r-- | sql/event_queue.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/event_queue.cc b/sql/event_queue.cc index 04449dd48a1..95f207844fc 100644 --- a/sql/event_queue.cc +++ b/sql/event_queue.cc @@ -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()) |