diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-02 15:50:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-02 15:50:35 +0400 |
| commit | 5a8bd446adf3d1a53b8bc4dd88b3830bf0270865 (patch) | |
| tree | 1c5fa5001e8d82bf01b4bbc2e7c5703499342656 /sql-common | |
| parent | 87355a453d4661a75f3b451b30b1867910915675 (diff) | |
| parent | b97b9536c71b3ad5ef521a1f21c527057a0a01c6 (diff) | |
| download | mariadb-git-5a8bd446adf3d1a53b8bc4dd88b3830bf0270865.tar.gz | |
Merge 5.3->5.5
pending merges:
Alexander Barkov 2013-12-02 MDEV-4857 Wrong result of HOUR('1 00:00:00')
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 69cd9458135..b91028cc1ea 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -645,8 +645,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]; |