diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-05-18 06:50:22 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-05-18 06:50:22 +0200 |
| commit | 97f5cdb8a18d00eb1e4c29599116cba4fa5e03b8 (patch) | |
| tree | 8da856053887eeb4c454c749857029f5e9c3a8d8 /sql-common | |
| parent | b1a7ae7987e174379f93397504d43d7062a67352 (diff) | |
| parent | 2018978eb4a702e3966dec3d89f36a2fb05e360b (diff) | |
| download | mariadb-git-97f5cdb8a18d00eb1e4c29599116cba4fa5e03b8.tar.gz | |
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
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index f08e2e00ef3..7c8719bc9e0 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -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; |