diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-04 21:25:39 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-04 21:25:39 +0300 |
| commit | 67da87d82e15f2efd81be1ed11384204215c23fd (patch) | |
| tree | cc30c4ae4bc34be9ddaaefb3115063e656e0f198 /sql/event_queue.cc | |
| parent | 65e5af7b7f8838c224d466ed0cd50440bc146ebc (diff) | |
| parent | 0b4db8addd6aa9fbb87d2cc8eac8331e69d1b0f2 (diff) | |
| download | mariadb-git-67da87d82e15f2efd81be1ed11384204215c23fd.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
mysql-test/t/sp.test:
Auto merged
mysys/typelib.c:
Auto merged
sql/event_data_objects.cc:
Auto merged
sql/event_db_repository.cc:
Auto merged
sql/event_queue.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/strfunc.cc:
Auto merged
sql/table.cc:
Auto merged
include/typelib.h:
Merged from 5.1 main tree.
mysql-test/r/sp.result:
Merged from 5.1 main tree.
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 f958102e269..e911683fb15 100644 --- a/sql/event_queue.cc +++ b/sql/event_queue.cc @@ -742,7 +742,7 @@ Event_queue::dump_internal_status() mutex_last_attempted_lock_at_line); printf("WOC : %s\n", waiting_on_cond? "YES":"NO"); - TIME time; + MYSQL_TIME time; my_tz_UTC->gmt_sec_to_TIME(&time, next_activation_at); printf("Next activation : %04d-%02d-%02d %02d:%02d:%02d\n", time.year, time.month, time.day, time.hour, time.minute, time.second); |