diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-07-27 12:51:55 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-07-27 12:51:55 +0400 |
| commit | 14ea4af7eb799e9a9c2b90a40173b7b3191a8ccb (patch) | |
| tree | 6399fea05095924720aa1bf88d1f2cfe8172158c /sql/item_timefunc.cc | |
| parent | 111570dfd6e1d0abc062f63045b371074ac2b630 (diff) | |
| parent | 3050742dd9c81e5e18b64343dc7d3ea67650e050 (diff) | |
| download | mariadb-git-14ea4af7eb799e9a9c2b90a40173b7b3191a8ccb.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 97ba38aa5be..6519146d040 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2747,7 +2747,7 @@ String *Item_time_typecast::val_str(String *str) bool Item_date_typecast::get_date(MYSQL_TIME *ltime, uint fuzzy_date) { - bool res= get_arg0_date(ltime, TIME_FUZZY_DATE); + bool res= get_arg0_date(ltime, fuzzy_date); ltime->hour= ltime->minute= ltime->second= ltime->second_part= 0; ltime->time_type= MYSQL_TIMESTAMP_DATE; return res; |