diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-22 14:06:37 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-22 14:06:37 +0400 |
| commit | a865876b1d65f32e31d40fc55217bb0a03266a10 (patch) | |
| tree | 463ef7e49122606c4fc94f6f7c765799b6d462c7 /sql-common | |
| parent | c65ce2e09fc8f4266b890616ede8e848c8de4eea (diff) | |
| parent | 2bd1c73e3db37b0dde4c7aed9a5ddff846fe610c (diff) | |
| download | mariadb-git-a865876b1d65f32e31d40fc55217bb0a03266a10.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into mysql.com:/usr/home/ram/work/bug21789/my41-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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index baf9a3902d9..86b533ce9b3 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -350,7 +350,10 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, l_time->year > 9999 || l_time->month > 12 || l_time->day > 31 || l_time->hour > 23 || l_time->minute > 59 || l_time->second > 59 || - (!(flags & TIME_FUZZY_DATE) && (l_time->month == 0 || l_time->day == 0))) + (!(flags & TIME_FUZZY_DATE) && + (l_time->month == 0 || l_time->day == 0)) || + (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 */ |