Commit 84b34741 authored by unknown's avatar unknown
Browse files

item_strfunc.cc:

  After merge change.
  4.1 method was replaced in 5.0.


sql/item_strfunc.cc:
  After merge change.
  4.1 method was replaced in 5.0.
parent 8685497a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1570,7 +1570,7 @@ Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs)
    return NULL;
  }
  conv->str_value.copy();
  conv->str_value.shrink_to_length();
  conv->str_value.mark_as_const();
  return conv;
}