10.0-base merge

This commit is contained in:
Sergei Golubchik 2013-12-16 13:02:21 +01:00
commit d28d3ba40d
1367 changed files with 67982 additions and 41096 deletions

View file

@ -604,8 +604,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];