mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge with 5.1-micro

Browse source
This commit is contained in:
Sergei Golubchik 2011-06-07 18:13:02 +02:00
commit 9b98cae4cc
84 changed files with 1754 additions and 1556 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sql/event_db_repository.cc
View file

@ -281,7 +281,7 @@ mysql_event_fill_row(THD *thd,
my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->starts);
fields[ET_FIELD_STARTS]->set_notnull();
fields[ET_FIELD_STARTS]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
fields[ET_FIELD_STARTS]->store_time(&time);
}
if (!et->ends_null)
@ -290,7 +290,7 @@ mysql_event_fill_row(THD *thd,
my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->ends);
fields[ET_FIELD_ENDS]->set_notnull();
fields[ET_FIELD_ENDS]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
fields[ET_FIELD_ENDS]->store_time(&time);
}
}
else if (et->execute_at)
@ -309,8 +309,7 @@ mysql_event_fill_row(THD *thd,
my_tz_OFFSET0->gmt_sec_to_TIME(&time, et->execute_at);
fields[ET_FIELD_EXECUTE_AT]->set_notnull();
fields[ET_FIELD_EXECUTE_AT]->
store_time(&time, MYSQL_TIMESTAMP_DATETIME);
fields[ET_FIELD_EXECUTE_AT]->store_time(&time);
}
else
{
@ -1088,8 +1087,7 @@ update_timing_fields_for_event(THD *thd,
my_tz_OFFSET0->gmt_sec_to_TIME(&time, last_executed);
fields[ET_FIELD_LAST_EXECUTED]->set_notnull();
fields[ET_FIELD_LAST_EXECUTED]->store_time(&time,
MYSQL_TIMESTAMP_DATETIME);
fields[ET_FIELD_LAST_EXECUTED]->store_time(&time);
}
if (update_status)
{