stringcmp() and sortcmp() have been unified

into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.

1 files changed, 5 insertions, 3 deletions

diff --git a/sql/item_sum.h b/sql/item_sum.h
index db8bded9946..74c7b11a7ba 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -369,17 +369,19 @@ class Item_sum_hybrid :public Item_sum
   enum_field_types hybrid_field_type;
   int cmp_sign;
   table_map used_table_cache;
-  int (*str_cmp_function)(const String *x,const String *y);
+  CHARSET_INFO *cmp_charset;
 
   public:
   Item_sum_hybrid(Item *item_par,int sign)
     :Item_sum(item_par), hybrid_type(INT_RESULT), cmp_sign(sign),
-    used_table_cache(~(table_map) 0)
+    used_table_cache(~(table_map) 0),
+    cmp_charset(&my_charset_bin)
   {}
   Item_sum_hybrid(THD *thd, Item_sum_hybrid &item):
     Item_sum(thd, item), value(item.value), tmp_value(item.tmp_value),
     sum(item.sum), sum_int(item.sum_int), hybrid_type(item.hybrid_type),
-    cmp_sign(item.cmp_sign), used_table_cache(used_table_cache) {}
+    cmp_sign(item.cmp_sign), used_table_cache(used_table_cache),
+    cmp_charset(item.cmp_charset) {}
   bool fix_fields(THD *, TABLE_LIST *, Item **);
   table_map used_tables() const { return used_table_cache; }
   bool const_item() const { return !used_table_cache; }