item.cc:

After merge fix.

item.cc:
After merge fix.
c64128cc · bar@mysql.com · 7d405e3c · c64128cc
Commit c64128cc authored Jul 14, 2005 by bar@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item.cc sql/item.cc +1 -1

No files found.
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -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);