diff options
| author | ramil/ram@mysql.com/myoffice.izhnet.ru <> | 2006-11-22 14:06:37 +0400 |
|---|---|---|
| committer | ramil/ram@mysql.com/myoffice.izhnet.ru <> | 2006-11-22 14:06:37 +0400 |
| commit | 8512b7e5bdc9ff1355b384f7b7c6c326b2ee6cdb (patch) | |
| tree | 463ef7e49122606c4fc94f6f7c765799b6d462c7 /sql-common | |
| parent | c6e856de10f62cdce3bde22d036a653053db5a0a (diff) | |
| parent | ce433e9e44c7870885d72b567e1c33f7a933f3cb (diff) | |
| download | mariadb-git-8512b7e5bdc9ff1355b384f7b7c6c326b2ee6cdb.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
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 */ |