merge with 3.23.42

11 files changed, 28 insertions, 24 deletions

diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c
index 76316638153..89415d31820 100644
--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@@ -80,7 +80,7 @@ print_array(FILE *f, const char *set, const char *name, int n)
     endptr = p;
     for (;;)
     {
-      while (isspace(*endptr))
+      while (isspace((* (unsigned char*) endptr)))
         ++endptr;
       if (*endptr && *endptr != '#')    /* not comment */
         break;
@@ -90,7 +90,7 @@ print_array(FILE *f, const char *set, const char *name, int n)
     }
 
     p = val;
-    while (!isspace(*endptr))
+    while (!isspace((* (unsigned char*) endptr)))
       *p++ = *endptr++;
     *p = '\0';
     p = endptr;
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 1fb98273fec..cccf6730046 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -236,7 +236,7 @@ int my_strnncoll_big5(const uchar * s1, int len1, const uchar * s2, int len2)
   return (int) (len1-len2);
 }
 
-int my_strnxfrm_big5(uchar * dest, uchar * src, int len, int srclen)
+int my_strnxfrm_big5(uchar * dest, const uchar * src, int len, int srclen)
 {
   uint16 e;
   /*uchar *d = dest; XXX: unused*/
@@ -276,7 +276,7 @@ int my_strcoll_big5(const uchar * s1, const uchar * s2)
   return 0;
 }
 
-int my_strxfrm_big5(uchar * dest, uchar * src, int len)
+int my_strxfrm_big5(uchar * dest, const uchar * src, int len)
 {
   uint16 e;
   uchar *d = dest;
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 9628f21b8d4..a5d55789bb8 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -2610,7 +2610,7 @@ int my_strcoll_gbk(const uchar * s1, const uchar * s2)
 			  s2, (uint) strlen((char*) s2));
 }
 
-int my_strnxfrm_gbk(uchar * dest, uchar * src, int len, int srclen)
+int my_strnxfrm_gbk(uchar * dest, const uchar * src, int len, int srclen)
 {
   uint16 e;
 
@@ -2630,7 +2630,7 @@ int my_strnxfrm_gbk(uchar * dest, uchar * src, int len, int srclen)
   return srclen;
 }
   
-int my_strxfrm_gbk(uchar * dest, uchar * src, int len)
+int my_strxfrm_gbk(uchar * dest, const uchar * src, int len)
 {
   return my_strnxfrm_gbk(dest,src,len,(uint) strlen((char*) src));
 }
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 9a5a91f9265..566271be845 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -228,10 +228,10 @@ int my_strcoll_sjis(const uchar *s1, const uchar *s2)
 				  s2,(uint) strlen((char*) s2));
 }
 
-int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
+int my_strnxfrm_sjis(uchar *dest, const uchar *src, int len, int srclen)
 {
   uchar *d_end = dest + len;
-  uchar *s_end = src + srclen;
+  uchar *s_end = (uchar*) src + srclen;
   while (dest < d_end && src < s_end) {
     if (ismbchar_sjis((char*) src, (char*) s_end)) {
       *dest++ = *src++;
@@ -244,7 +244,7 @@ int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
   return srclen;
 }
 
-int my_strxfrm_sjis(uchar *dest, uchar *src, int len)
+int my_strxfrm_sjis(uchar *dest, const uchar *src, int len)
 {
   return my_strnxfrm_sjis(dest, src, len, (uint) strlen((char*) src));
 }
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 321487c85cb..1c0acc38e24 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -535,7 +535,7 @@ int my_strnncoll_tis620(const uchar * s1, int len1, const uchar * s2, int len2)
    Arg: Destination buffer, source string, dest length and source length
    Ret: Conveted string size
 */
-int my_strnxfrm_tis620(uchar * dest, uchar * src, int len, int srclen)
+int my_strnxfrm_tis620(uchar * dest, const uchar * src, int len, int srclen)
 {
   uint bufSize;
   uchar *tmp;
@@ -567,7 +567,7 @@ int my_strcoll_tis620(const uchar * s1, const uchar * s2)
    Arg: Destination buffer, String and	dest buffer size
    Ret: Converting string size
 */
-int my_strxfrm_tis620(uchar * dest, uchar * src, int len)
+int my_strxfrm_tis620(uchar * dest, const uchar * src, int len)
 {
   uint bufSize;
   uchar *tmp;
diff --git a/strings/ctype.c b/strings/ctype.c
index 1178d15b515..a0e183a89d6 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -48,7 +48,7 @@ CHARSET_INFO *find_compiled_charset_by_name(const char *name)
   return NULL;
 }
 
-uint8 compiled_charset_number(const char *name)
+uint compiled_charset_number(const char *name)
 {
   CHARSET_INFO *cs;
   for (cs = compiled_charsets; cs->number > 0; cs++)
@@ -58,7 +58,7 @@ uint8 compiled_charset_number(const char *name)
   return 0;   /* this mimics find_type() */
 }
 
-const char *compiled_charset_name(uint8 charset_number)
+const char *compiled_charset_name(uint charset_number)
 {
   CHARSET_INFO *cs;
   for (cs = compiled_charsets; cs->number > 0; cs++)
diff --git a/strings/strnlen.c b/strings/strnlen.c
index 6eb872ee08d..3d625f7d48a 100644
--- a/strings/strnlen.c
+++ b/strings/strnlen.c
@@ -29,7 +29,7 @@
 
 uint strnlen(register const char *s, register uint maxlen)
 {
-  const char *end= memchr(s, '\0', maxlen);
+  const char *end= (const char *)memchr(s, '\0', maxlen);
   return end ? (uint) (end - s) : maxlen;
 }
 
diff --git a/strings/strto.c b/strings/strto.c
index eb8caab2ab6..64b1c9a5ae9 100644
--- a/strings/strto.c
+++ b/strings/strto.c
@@ -42,13 +42,17 @@
 #include "my_sys.h"			/* defines errno */
 #include <errno.h>
 
-#ifdef LONGLONG
+#undef strtoull
+#undef strtoll
+#undef strtoul
+#undef strtol
+#ifdef USE_LONGLONG
 #define UTYPE_MAX (~(ulonglong) 0)
 #define TYPE_MIN LONGLONG_MIN
 #define TYPE_MAX LONGLONG_MAX
 #define longtype longlong
 #define ulongtype ulonglong
-#ifdef UNSIGNED
+#ifdef USE_UNSIGNED
 #define function ulongtype strtoull
 #else
 #define function longtype strtoll
@@ -59,7 +63,7 @@
 #define TYPE_MAX LONG_MAX
 #define longtype long
 #define ulongtype unsigned long
-#ifdef UNSIGNED
+#ifdef USE_UNSIGNED
 #define function ulongtype strtoul
 #else
 #define function longtype strtol
@@ -170,7 +174,7 @@ function (const char *nptr,char **endptr,int base)
   if (endptr != NULL)
     *endptr = (char *) s;
 
-#ifndef UNSIGNED
+#ifndef USE_UNSIGNED
   /* Check for a value that is within the range of
      `unsigned long int', but outside the range of `long int'.	*/
   if (negative)
@@ -185,7 +189,7 @@ function (const char *nptr,char **endptr,int base)
   if (overflow)
   {
     my_errno=ERANGE;
-#ifdef UNSIGNED
+#ifdef USE_UNSIGNED
     return UTYPE_MAX;
 #else
     return negative ? TYPE_MIN : TYPE_MAX;
diff --git a/strings/strtoll.c b/strings/strtoll.c
index f43dae726f5..678c28649ef 100644
--- a/strings/strtoll.c
+++ b/strings/strtoll.c
@@ -19,7 +19,7 @@
 
 #include <global.h>
 #include <m_string.h>
-#if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG)
-#define LONGLONG
+#if !defined(HAVE_STRTOLL) && defined(HAVE_LONG_LONG)
+#define USE_LONGLONG
 #include "strto.c"
 #endif
diff --git a/strings/strtoul.c b/strings/strtoul.c
index bbfaa6ad22a..e49a9ebea6a 100644
--- a/strings/strtoul.c
+++ b/strings/strtoul.c
@@ -19,6 +19,6 @@
 
 #include <global.h>
 #if !defined(MSDOS) && !defined(HAVE_STRTOUL)
-#define UNSIGNED
+#define USE_UNSIGNED
 #include "strto.c"
 #endif
diff --git a/strings/strtoull.c b/strings/strtoull.c
index 42ce5ea4177..74dab95b801 100644
--- a/strings/strtoull.c
+++ b/strings/strtoull.c
@@ -20,7 +20,7 @@
 #include <global.h>
 #include <m_string.h>
 #if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG)
-#define UNSIGNED
-#define LONGLONG
+#define USE_UNSIGNED
+#define USE_LONGLONG
 #include "strto.c"
 #endif