diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-15 15:57:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-15 15:57:26 +0100 |
| commit | 6bf10fac445d73fb796d4863612c87bff5f28b66 (patch) | |
| tree | 4d51e193684163c21e47e9de6536cd8dae0613eb /sql-common | |
| parent | 8efaff4959efe32ff9bc47c1bf1710cfe9ab21b5 (diff) | |
| parent | 39a8d7965d912d8fb32436735449ce04e85583d1 (diff) | |
| download | mariadb-git-6bf10fac445d73fb796d4863612c87bff5f28b66.tar.gz | |
5.5 merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 05dcd773321..297eec15b13 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -557,8 +557,8 @@ fractional: l_time->year= 0; /* For protocol::store_time */ l_time->month= 0; - l_time->day= date[0]; - l_time->hour= date[1]; + l_time->day= 0; + l_time->hour= date[1] + date[0] * 24; /* Mix days and hours */ l_time->minute= date[2]; l_time->second= date[3]; l_time->second_part= date[4]; |