Skip to content

M
MariaDB
Commit 8885c80d authored by gvb@phoenix.(none)'s avatar gvb@phoenix.(none)
Browse files
Options

item_timefunc.cc: 

  fix for bug #15828 after review
parent 421eeded
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
sql/item_timefunc.cc
View file @ 8885c80d
...@@ -2751,7 +2751,6 @@ void Item_func_str_to_date::fix_length_and_dec() ...@@ -2751,7 +2751,6 @@ void Item_func_str_to_date::fix_length_and_dec()
max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN; max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN;
cached_timestamp_type= MYSQL_TIMESTAMP_NONE; cached_timestamp_type= MYSQL_TIMESTAMP_NONE;
if (!args[1]->null_value && (const_item= args[1]->const_item())) if (!args[1]->null_value && (const_item= args[1]->const_item()))
//if ((const_item= args[1]->const_item()) && !args[1]->null_value)
{ {
format= args[1]->val_str(&format_str); format= args[1]->val_str(&format_str);
cached_format_type= get_date_time_result_type(format->ptr(), cached_format_type= get_date_time_result_type(format->ptr(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7