diff options
| author | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-22 13:41:33 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-22 13:41:33 +0400 |
| commit | 2c80707e74c0462c4a412f9a71092ce90a632e90 (patch) | |
| tree | 17ac23725a27dca1c3b405836457b6a01fadd2c6 /sql-common | |
| parent | 1460859253724f4b1f62c2db56b4c8361b2fa22a (diff) | |
| parent | 96de5fabb2a8917ced402d31014399570b14f4e1 (diff) | |
| download | mariadb-git-2c80707e74c0462c4a412f9a71092ce90a632e90.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
mysql-test/r/date_formats.result:
Auto merged
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index ebcf393c49a..839bae51d64 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -411,7 +411,9 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, if (number_of_fields < 3 || l_time->year > 9999 || l_time->month > 12 || l_time->day > 31 || l_time->hour > 23 || - l_time->minute > 59 || l_time->second > 59) + l_time->minute > 59 || l_time->second > 59 || + (l_time->year == 0 && l_time->month == 0 && l_time->day == 0 && + (l_time->hour != 0 || l_time->minute != 0 || l_time->second != 0))) { /* Only give warning for a zero date if there is some garbage after */ if (!not_zero_date) /* If zero date */ |