stringcmp() and sortcmp() have been unified

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

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/sql_string.h b/sql/sql_string.h
index 047faf3e3db..8e0705844ad 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -25,8 +25,7 @@
 #endif
 
 class String;
-int sortcmp(const String *a,const String *b);
-int stringcmp(const String *a,const String *b);
+int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
 String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
 
 class String
@@ -205,8 +204,7 @@ public:
   void strip_sp();
   inline void caseup() { my_caseup(str_charset,Ptr,str_length); }
   inline void casedn() { my_casedn(str_charset,Ptr,str_length); }
-  friend int sortcmp(const String *a,const String *b);
-  friend int stringcmp(const String *a,const String *b);
+  friend int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
   friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
   uint32 numchars();
   int charpos(int i,uint32 offset=0);