diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-02-06 14:28:46 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-02-06 14:28:46 +0400 |
| commit | e976ea37b0340562b466dab374b78f028e869939 (patch) | |
| tree | ee2912b11d0c6da01a787d26373e9401d691e59c /sql/item_timefunc.cc | |
| parent | cbace0b7b46b5515ee92ee5313d4a98b6e0232d9 (diff) | |
| parent | 61b286e4160d83be2dbd9edb92ef4ec359dccb6b (diff) | |
| download | mariadb-git-e976ea37b0340562b466dab374b78f028e869939.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index e99db62068d..05498018386 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2644,7 +2644,10 @@ longlong Item_date_typecast::val_int() DBUG_ASSERT(fixed == 1); TIME ltime; if (args[0]->get_date(<ime, TIME_FUZZY_DATE)) + { + null_value= 1; return 0; + } return (longlong) (ltime.year * 10000L + ltime.month * 100 + ltime.day); } |