my_strncasecmp() is not used anymore. Use my_strncoll() instead.

15 files changed, 0 insertions, 53 deletions

diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index c25e3aa79e0..43d6f1a8e13 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6264,7 +6264,6 @@ CHARSET_INFO my_charset_big5 =
     my_caseup_mb,
     my_casedn_mb,
     my_strcasecmp_mb,
-    my_strncasecmp_mb,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 432550e4e4c..568165896ca 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -118,12 +118,6 @@ static int my_strcasecmp_bin(CHARSET_INFO * cs __attribute__((unused)),
   return strcmp(s,t);
 }
 
-static int my_strncasecmp_bin(CHARSET_INFO * cs __attribute__((unused)),
-				const char *s, const char *t, uint len)
-{
-  return memcmp(s,t,len);
-}
-
 static int my_mb_wc_bin(CHARSET_INFO *cs __attribute__((unused)),
 		  my_wc_t *wc,
 		  const unsigned char *str,
@@ -301,7 +295,6 @@ CHARSET_INFO my_charset_bin =
     my_caseup_bin,		/* caseup        */
     my_casedn_bin,		/* casedn        */
     my_strcasecmp_bin,		/* strcasecmp    */
-    my_strncasecmp_bin,		/* strncasecmp   */
     my_hash_sort_bin,		/* hash_sort     */
     (char) 255,			/* max_sort_char */
     my_snprintf_8bit,		/* snprintf      */
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index e52eedf737f..0ff7718b6d8 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -638,7 +638,6 @@ CHARSET_INFO my_charset_czech =
     my_caseup_8bit,
     my_casedn_8bit,
     my_strcasecmp_8bit,
-    my_strncasecmp_8bit,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index 991bf9cb690..5b1240e1a92 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -8672,7 +8672,6 @@ CHARSET_INFO my_charset_euc_kr =
     my_caseup_mb,
     my_casedn_mb,
     my_strcasecmp_mb,
-    my_strncasecmp_mb,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c
index 8690f20d6de..60934d5ff55 100644
--- a/strings/ctype-extra.c
+++ b/strings/ctype-extra.c
@@ -62,7 +62,6 @@ CHARSET_INFO compiled_charsets[] = {
     NULL,
     NULL,
     NULL,
-    NULL,
     NULL
   }
 };
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index 57d227d147f..4d0fdda5c6e 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -5722,7 +5722,6 @@ CHARSET_INFO my_charset_gb2312 =
     my_caseup_mb,
     my_casedn_mb,
     my_strcasecmp_mb,
-    my_strncasecmp_mb,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 9c018c4e569..c39ef62b97c 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -9919,7 +9919,6 @@ CHARSET_INFO my_charset_gbk =
     my_caseup_mb,
     my_casedn_mb,
     my_strcasecmp_mb,
-    my_strncasecmp_mb,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index d561c82ed7d..d626d7c4464 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@@ -208,7 +208,6 @@ CHARSET_INFO my_charset_latin1 =
     my_caseup_8bit,
     my_casedn_8bit,
     my_strcasecmp_8bit,
-    my_strncasecmp_8bit,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
@@ -463,7 +462,6 @@ CHARSET_INFO my_charset_latin1_de =
     my_caseup_8bit,
     my_casedn_8bit,
     my_strcasecmp_8bit,
-    my_strncasecmp_8bit,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index 4c1f791b8e4..625dbbae751 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@@ -116,30 +116,6 @@ int my_strcasecmp_mb(CHARSET_INFO * cs,const char *s, const char *t)
 }
 
 
-int my_strncasecmp_mb(CHARSET_INFO * cs,
-				const char *s, const char *t, uint len)
-{
-  register uint32 l;
-  register const char *end=s+len;
-  register uchar *map=cs->to_upper;
-  
-  while (s<end)
-  {
-    if ((l=my_ismbchar(cs, s,end)))
-    {
-      while (l--)
-        if (*s++ != *t++) 
-          return 1;
-    }
-    else if (my_ismbhead(cs, *t)) 
-      return 1;
-    else if (map[(uchar) *s++] != map[(uchar) *t++]) 
-      return 1;
-  }
-  return 0;
-}
-
-
 /*
 ** Compare string against string with wildcard
 **	0 if matched
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index cab7c4a0267..7d8f5b9535b 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -116,14 +116,6 @@ int my_strcasecmp_8bit(CHARSET_INFO * cs,const char *s, const char *t)
 }
 
 
-int my_strncasecmp_8bit(CHARSET_INFO * cs,
-				const char *s, const char *t, uint len)
-{
- register uchar *map=cs->to_upper;
- while (len-- != 0 && map[(uchar)*s++] == map[(uchar)*t++]) ;
-   return (int) len+1;
-}
-
 int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc,
 		  const unsigned char *str,
 		  const unsigned char *end __attribute__((unused)))
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 036296efe32..5fc0d3f069a 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4506,7 +4506,6 @@ CHARSET_INFO my_charset_sjis =
     my_caseup_8bit,
     my_casedn_8bit,
     my_strcasecmp_8bit,
-    my_strncasecmp_8bit,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 1a5758a3e99..d08faa2e6c6 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -729,7 +729,6 @@ CHARSET_INFO my_charset_tis620 =
     my_caseup_8bit,
     my_casedn_8bit,
     my_strcasecmp_8bit,
-    my_strncasecmp_8bit,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index dba87c6d692..88f0f67ec1b 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8463,7 +8463,6 @@ CHARSET_INFO my_charset_ujis =
     my_caseup_mb,
     my_casedn_mb,
     my_strcasecmp_mb,
-    my_strncasecmp_mb,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 7657abf5f19..0f784fe26c0 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -1988,7 +1988,6 @@ CHARSET_INFO my_charset_utf8 =
     my_caseup_utf8,
     my_casedn_utf8,
     my_strcasecmp_utf8,
-    my_strncasecmp_utf8,
     my_hash_sort_utf8,	/* hash_sort    */
     0,
     my_snprintf_8bit,
@@ -3071,7 +3070,6 @@ CHARSET_INFO my_charset_ucs2 =
     my_caseup_ucs2,
     my_casedn_ucs2,
     my_strcasecmp_ucs2,
-    my_strncasecmp_ucs2,
     my_hash_sort_ucs2,	/* hash_sort    */
     0,
     my_snprintf_ucs2,
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 951f4b4c80e..dea4a096006 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -673,7 +673,6 @@ CHARSET_INFO my_charset_win1250ch =
     my_caseup_8bit,
     my_casedn_8bit,
     my_strcasecmp_8bit,
-    my_strncasecmp_8bit,
     my_hash_sort_simple,
     0,
     my_snprintf_8bit,