Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 sql-common/my_time.c: Manual merge
This commit is contained in:
commit
97f5cdb8a1
@ -1147,7 +1147,7 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
|
||||
ok:
|
||||
part1=(long) (nr/LL(1000000));
|
||||
part2=(long) (nr - (longlong) part1*LL(1000000));
|
||||
time_res->neg= 0;
|
||||
bzero((char*) time_res, sizeof(*time_res));
|
||||
time_res->year= (int) (part1/10000L); part1%=10000L;
|
||||
time_res->month= (int) part1 / 100;
|
||||
time_res->day= (int) part1 % 100;
|
||||
|
Loading…
x
Reference in New Issue
Block a user