Commit f36a0fee authored by unknown's avatar unknown
Browse files

item_timefunc.cc: 

  fix for bug#15828 after review


sql/item_timefunc.cc:
  fix for bug#15828 after review
parent 25e32d83

sql/item_timefunc.cc

+2 −1
Original line number Diff line number Diff line
@@ -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(),