diff options
author | monty@nosik.monty.fi <> | 2007-08-02 07:55:33 +0300 |
---|---|---|
committer | monty@nosik.monty.fi <> | 2007-08-02 07:55:33 +0300 |
commit | 93f0771fca8b2b6eb4ebfec81702fcee69ddaa3d (patch) | |
tree | 5c544cc45c47bbd06c8b4d216aab02fe9307f8de /sql/event_data_objects.cc | |
parent | 2459558060cbc959ffa4b487a1db323bf4f384cd (diff) | |
parent | 4f33d95fa3be042234a2cc8e351bdf52cea3376d (diff) | |
download | mariadb-git-93f0771fca8b2b6eb4ebfec81702fcee69ddaa3d.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/event_data_objects.cc')
-rw-r--r-- | sql/event_data_objects.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 144a87e13f6..2ab77ad6b11 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1645,7 +1645,7 @@ err: void Event_queue_element::mark_last_executed(THD *thd) { - thd->end_time(); + thd->set_current_time(); last_executed= (my_time_t) thd->query_start(); last_executed_changed= TRUE; |