diff options
| author | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-03-26 13:45:02 +0500 |
|---|---|---|
| committer | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-03-26 13:45:02 +0500 |
| commit | ebe44e6e31f7845839bd27994401ae5496445a2d (patch) | |
| tree | c50e2c46ed2e9e087c0d26df5d1f5fc235692c8f /sql-common | |
| parent | 21ed11cda24ced68304a453af8ec24943075d7fc (diff) | |
| parent | fab56c1f243aa02b04e8d3d87104cc4a54db90a2 (diff) | |
| download | mariadb-git-ebe44e6e31f7845839bd27994401ae5496445a2d.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into mysql.com:/home/ram/work/b25301/b25301.4.1
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 77226da3dc8..8f3646e84eb 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -350,10 +350,7 @@ 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)) || - (l_time->year == 0 && l_time->month == 0 && l_time->day == 0 && - (l_time->hour != 0 || l_time->minute != 0 || l_time->second != 0))) + (!(flags & TIME_FUZZY_DATE) && (l_time->month == 0 || l_time->day == 0))) { /* Only give warning for a zero date if there is some garbage after */ if (!not_zero_date) /* If zero date */ |