diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-03-28 17:33:35 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-03-28 17:33:35 +0400 |
| commit | 2bcaf2714446a9b8fee7112a51a6c5062ff85ea9 (patch) | |
| tree | 3dbaeee1ed164d6db4c509e6e98b07a5170fb903 /sql/item_timefunc.cc | |
| parent | 7dca4626fb842fa2f5b2d3eb72b2fb608c934970 (diff) | |
| parent | 9d1c240ac2574c18897bb9b88f5f859b0751c1e8 (diff) | |
| download | mariadb-git-2bcaf2714446a9b8fee7112a51a6c5062ff85ea9.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index c277e538999..c2363409269 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3405,6 +3405,7 @@ void Item_func_str_to_date::fix_length_and_dec() { maybe_null= 1; decimals=0; + cached_format_type= DATE_TIME; cached_field_type= MYSQL_TYPE_DATETIME; max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN; cached_timestamp_type= MYSQL_TIMESTAMP_NONE; |