More use of new CHARSET_INFO functions and two bug fixes

sql/sql_string.cc:
  More use of new CHARSET_INFO functions
strings/ctype-mb.c:
  Bug fix
strings/ctype-utf8.c:
  Bug fix

1 files changed, 3 insertions, 36 deletions

diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 62b347b672d..21e38397842 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -363,46 +363,13 @@ bool String::append(IO_CACHE* file, uint32 arg_length)
 
 uint32 String::numchars()
 {
-#ifdef USE_MB
-  register uint32 n=0,mblen;
-  register const char *mbstr=Ptr;
-  register const char *end=mbstr+str_length;
-  if (use_mb(str_charset))
-  {
-    while (mbstr < end) {
-        if ((mblen=my_ismbchar(str_charset, mbstr,end))) mbstr+=mblen;
-        else ++mbstr;
-        ++n;
-    }
-    return n;
-  }
-  else
-#endif
-    return str_length;
+  return str_charset->numchars(str_charset, Ptr, Ptr+str_length);
 }
 
 int String::charpos(int i,uint32 offset)
 {
-#ifdef USE_MB
-  register uint32 mblen;
-  register const char *mbstr=Ptr+offset;
-  register const char *end=Ptr+str_length;
-  if (use_mb(str_charset))
-  {
-    if (i<=0) return i;
-    while (i && mbstr < end) {
-       if ((mblen=my_ismbchar(str_charset, mbstr,end))) mbstr+=mblen;
-       else ++mbstr;
-       --i;
-    }
-    if ( INT_MAX32-i <= (int) (mbstr-Ptr-offset)) 
-      return INT_MAX32;
-    else 
-      return (int) ((mbstr-Ptr-offset)+i);
-  }
-  else
-#endif
-    return i;
+  if (i<0) return i;
+  return str_charset->charpos(str_charset,Ptr+offset,Ptr+str_length,i);
 }
 
 int String::strstr(const String &s,uint32 offset)