stringcmp() and sortcmp() have been unified

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

1 files changed, 6 insertions, 16 deletions

diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 9e9d7a08925..36464126ae5 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -41,13 +41,13 @@
 int sortcmp2(void* cmp_arg __attribute__((unused)),
 	     const String *a,const String *b)
 {
-  return sortcmp(a,b);
+  return sortcmp(a,b,a->charset());
 }
 
 int stringcmp2(void* cmp_arg __attribute__((unused)),
 	     const String *a,const String *b)
 {
-  return stringcmp(a,b);
+  return sortcmp(a,b,&my_charset_bin);
 }
 
 int compare_double2(void* cmp_arg __attribute__((unused)),
@@ -329,20 +329,10 @@ void field_str::add()
     if (length > max_length)
       max_length = length;
 
-    if (item->binary())
-    {
-      if (stringcmp(res, &min_arg) < 0)
-	min_arg.copy(*res);
-      if (stringcmp(res, &max_arg) > 0)
-	max_arg.copy(*res);
-    }
-    else
-    {
-      if (sortcmp(res, &min_arg) < 0)
-	min_arg.copy(*res);
-      if (sortcmp(res, &max_arg) > 0)
-	max_arg.copy(*res);
-    }
+    if (sortcmp(res, &min_arg,item->charset()) < 0)
+      min_arg.copy(*res);
+    if (sortcmp(res, &max_arg,item->charset()) > 0)
+      max_arg.copy(*res);
   }
 
   if (room_in_tree)