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_db_repository.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_db_repository.cc')
| -rw-r--r-- | sql/event_db_repository.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc index b6c9e4ea8e3..7ec24db7b60 100644 --- a/sql/event_db_repository.cc +++ b/sql/event_db_repository.cc @@ -218,7 +218,7 @@ mysql_event_fill_row(THD *thd, TABLE *table, Event_parse_data *et, if (!et->starts_null) { - TIME time; + MYSQL_TIME time; my_tz_UTC->gmt_sec_to_TIME(&time, et->starts); fields[ET_FIELD_STARTS]->set_notnull(); @@ -227,7 +227,7 @@ mysql_event_fill_row(THD *thd, TABLE *table, Event_parse_data *et, if (!et->ends_null) { - TIME time; + MYSQL_TIME time; my_tz_UTC->gmt_sec_to_TIME(&time, et->ends); fields[ET_FIELD_ENDS]->set_notnull(); @@ -246,7 +246,7 @@ mysql_event_fill_row(THD *thd, TABLE *table, Event_parse_data *et, fields[ET_FIELD_STARTS]->set_null(); fields[ET_FIELD_ENDS]->set_null(); - TIME time; + MYSQL_TIME time; my_tz_UTC->gmt_sec_to_TIME(&time, et->execute_at); fields[ET_FIELD_EXECUTE_AT]->set_notnull(); @@ -653,7 +653,7 @@ Event_db_repository::create_event(THD *thd, Event_parse_data *parse_data, ok: if (dbchanged) - (void) mysql_change_db(thd, old_db.str, 1); + (void) mysql_change_db(thd, &old_db, 1); /* This statement may cause a spooky valgrind warning at startup inside init_key_cache on my system (ahristov, 2006/08/10) @@ -663,7 +663,7 @@ ok: err: if (dbchanged) - (void) mysql_change_db(thd, old_db.str, 1); + (void) mysql_change_db(thd, &old_db, 1); if (table) close_thread_tables(thd); DBUG_RETURN(TRUE); |