Commit 9f707ab2 authored by unknown's avatar unknown

item.cc:

  After merge fix.


sql/item.cc:
  After merge fix.
parent 212345b4
......@@ -3783,7 +3783,7 @@ bool Item_hex_string::eq(const Item *arg, bool binary_cmp) const
}
Item *Item_varbinary::safe_charset_converter(CHARSET_INFO *tocs)
Item *Item_hex_string::safe_charset_converter(CHARSET_INFO *tocs)
{
Item_string *conv;
String tmp, *str= val_str(&tmp);
......
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