diff options
| author | anozdrin/alik@station. <> | 2007-12-14 16:30:22 +0300 |
|---|---|---|
| committer | anozdrin/alik@station. <> | 2007-12-14 16:30:22 +0300 |
| commit | 151444c626c75eab2f8b331c4296c1cff111a907 (patch) | |
| tree | 362dc5c4acd0fff3e86d1b9d4b96ef068d73b341 /sql-common | |
| parent | 614b0f6884092257e346c6c2d6bec67da0dd3fd2 (diff) | |
| parent | 27dcbc257767384aec2f1b8530e266cad9022510 (diff) | |
| download | mariadb-git-151444c626c75eab2f8b331c4296c1cff111a907.tar.gz | |
Merge station.:/mnt/raid/alik/MySQL/devel/5.1
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 48d1b198dfc..543a925681b 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -1105,9 +1105,14 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res, long part1,part2; *was_cut= 0; + bzero((char*) time_res, sizeof(*time_res)); + time_res->time_type=MYSQL_TIMESTAMP_DATE; if (nr == LL(0) || nr >= LL(10000101000000)) + { + time_res->time_type=MYSQL_TIMESTAMP_DATETIME; goto ok; + } if (nr < 101) goto err; if (nr <= (YY_PART_YEAR-1)*10000L+1231L) @@ -1131,6 +1136,9 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res, } if (nr < 101000000L) goto err; + + time_res->time_type=MYSQL_TIMESTAMP_DATETIME; + if (nr <= (YY_PART_YEAR-1)*LL(10000000000)+LL(1231235959)) { nr= nr+LL(20000000000000); /* YYMMDDHHMMSS, 2000-2069 */ @@ -1144,7 +1152,6 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res, ok: part1=(long) (nr/LL(1000000)); part2=(long) (nr - (longlong) part1*LL(1000000)); - 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; |