item_timefunc.cc:

fix for bug#15828 after review

item_timefunc.cc:
fix for bug#15828 after review
421eeded · gvb@phoenix.(none) · 45db1c24 · 421eeded
Commit 421eeded authored Jan 14, 2006 by gvb@phoenix.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/item_timefunc.cc sql/item_timefunc.cc +2 -1

No files found.
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2750,7 +2750,8 @@ void Item_func_str_to_date::fix_length_and_dec()
  cached_field_type= MYSQL_TYPE_STRING;
  max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN;
  cached_timestamp_type= MYSQL_TIMESTAMP_NONE;
-  if ((const_item= args[1]->const_item()) && !args[1]->null_value)
+  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);
    cached_format_type= get_date_time_result_type(format->ptr(),