diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-01 00:46:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-01 00:46:13 +0200 |
| commit | 64ceea7a56ba776a226577f7c5ab5b549638f54a (patch) | |
| tree | 0629f9cbe18797606615f10886720da750dc26e8 /sql-common | |
| parent | 7a79fe52fe6081432a4b44483b55ccbf77c4489a (diff) | |
| parent | 8fa14ba6e6c6e7360d0799d703a5af26e2c2c61f (diff) | |
| download | mariadb-git-64ceea7a56ba776a226577f7c5ab5b549638f54a.tar.gz | |
Merge with 5.1 to get fixes for tests and compiler warnings
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 95078a50097..0408ea1e11f 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -727,6 +727,9 @@ void my_init_time(void) my_time.hour= (uint) l_time->tm_hour; my_time.minute= (uint) l_time->tm_min; my_time.second= (uint) l_time->tm_sec; + my_time.neg= 0; + my_time.second_part= 0; + my_time.time_type= MYSQL_TIMESTAMP_DATETIME; my_system_gmt_sec(&my_time, &my_time_zone, ¬_used); /* Init my_time_zone */ } |