diff options
| author | unknown <evgen@moonbone.local> | 2007-07-20 22:05:20 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-07-20 22:05:20 +0400 |
| commit | d758b1e629a78e1cf58c8a04da51e3c33630368c (patch) | |
| tree | 24c39cc281f4e341c192a3b48f8669e29940029d /sql | |
| parent | db31d3c96d398930dbeb0cedfb86aaa2bd558144 (diff) | |
| parent | a131428f041cd015662240bde255d159bcc53af7 (diff) | |
| download | mariadb-git-d758b1e629a78e1cf58c8a04da51e3c33630368c.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/29898-bug-5.0-opt-mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_timefunc.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 9795ec5f413..873e2833a1e 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2662,11 +2662,8 @@ longlong Item_date_typecast::val_int() { DBUG_ASSERT(fixed == 1); MYSQL_TIME ltime; - if (args[0]->get_date(<ime, TIME_FUZZY_DATE)) - { - null_value= 1; + if ((null_value= args[0]->get_date(<ime, TIME_FUZZY_DATE))) return 0; - } return (longlong) (ltime.year * 10000L + ltime.month * 100 + ltime.day); } |