Merge work.mysql.com:/home/bk/mysql-4.1

into myvenu.com:/home/venu/bk/src-4.1

strings/ctype-simple.c

@@ -213,10 +213,12 @@ long        my_strntol_8bit(CHARSET_INFO *cs,
   register unsigned char c;
   const char *save, *e;
   int overflow;
-  
+
+#if 0
   if (base < 0 || base == 1 || base > 36)
     base = 10;
-  
+#endif
+
   s = nptr;
   e = nptr+l;
   
@@ -241,9 +243,12 @@ long        my_strntol_8bit(CHARSET_INFO *cs,
   else
     negative = 0;
 
+#if 0
   if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
     s += 2;
+#endif
 
+#if 0
   if (base == 0)
   {
     if (*s == '0')
@@ -259,6 +264,7 @@ long        my_strntol_8bit(CHARSET_INFO *cs,
     else
       base = 10;
   }
+#endif
 
   save = s;
   cutoff = ((ulong)~0L) / (unsigned long int) base;
@@ -330,9 +336,11 @@ ulong      my_strntoul_8bit(CHARSET_INFO *cs,
   const char *save, *e;
   int overflow;
 
+#if 0
   if (base < 0 || base == 1 || base > 36)
     base = 10;
-  
+#endif
+
   s = nptr;
   e = nptr+l;
   
@@ -356,9 +364,12 @@ ulong      my_strntoul_8bit(CHARSET_INFO *cs,
   else
     negative = 0;
 
+#if 0
   if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
     s += 2;
+#endif
 
+#if 0
   if (base == 0)
   {
     if (*s == '0')
@@ -374,6 +385,7 @@ ulong      my_strntoul_8bit(CHARSET_INFO *cs,
     else
       base = 10;
   }
+#endif
 
   save = s;
   cutoff = ((ulong)~0L) / (unsigned long int) base;
@@ -437,8 +449,10 @@ longlong   my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
   const char *save;
   int overflow;
 
+#if 0
   if (base < 0 || base == 1 || base > 36)
     base = 10;
+#endif
 
   s = nptr;
   e = nptr+l;
@@ -463,9 +477,12 @@ longlong   my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
   else
     negative = 0;
 
+#if 0
   if (base == 16 && s[0] == '0' && (s[1]=='X'|| s[1]=='x'))
     s += 2;
+#endif
 
+#if 0
   if (base == 0)
   {
     if (*s == '0')
@@ -481,6 +498,7 @@ longlong   my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
     else
       base = 10;
   }
+#endif
 
   save = s;
 
@@ -553,8 +571,10 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
   const char *save;
   int overflow;
 
+#if 0
   if (base < 0 || base == 1 || base > 36)
     base = 10;
+#endif
 
   s = nptr;
   e = nptr+l;
@@ -579,9 +599,12 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
   else
     negative = 0;
 
+#if 0
   if (base == 16 && s[0] == '0' && (s[1]=='X' || s[1]=='x'))
     s += 2;
+#endif
 
+#if 0
   if (base == 0)
   {
     if (*s == '0')
@@ -597,6 +620,7 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
     else
       base = 10;
   }
+#endif
 
   save = s;
 

strings/ctype-utf8.c

@@ -23,6 +23,10 @@
 #include "m_ctype.h"
 #include <errno.h>
 
+#ifndef EILSEQ
+#define EILSEQ ENOENT
+#endif
+
 #ifdef HAVE_CHARSET_utf8
 #define HAVE_UNIDATA
 #endif
@@ -2482,9 +2486,11 @@ long        my_strntol_ucs2(CHARSET_INFO *cs,
   } while (1);
   
 bs:
-  
+
+#if 0  
   if (base <= 0 || base == 1 || base > 36)
     base = 10;
+#endif
   
   overflow = 0;
   res = 0;
@@ -2593,10 +2599,12 @@ ulong      my_strntoul_ucs2(CHARSET_INFO *cs,
   } while (1);
   
 bs:
-  
+
+#if 0
   if (base <= 0 || base == 1 || base > 36)
     base = 10;
-  
+#endif
+
   overflow = 0;
   res = 0;
   save = s;
@@ -2698,10 +2706,12 @@ longlong  my_strntoll_ucs2(CHARSET_INFO *cs,
   } while (1);
   
 bs:
-  
+
+#if 0  
   if (base <= 0 || base == 1 || base > 36)
     base = 10;
-  
+#endif
+
   overflow = 0;
   res = 0;
   save = s;
@@ -2812,9 +2822,11 @@ ulonglong  my_strntoull_ucs2(CHARSET_INFO *cs,
   
 bs:
   
+#if 0
   if (base <= 0 || base == 1 || base > 36)
     base = 10;
-  
+#endif
+
   overflow = 0;
   res = 0;
   save = s;

strings/ctype.c

@@ -4066,7 +4066,7 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
   
   switch (state) {
   case _CS_ID:
-    i->cs.number= my_strntoul(my_charset_latin1,attr,len,0,(char**)NULL,&err);
+    i->cs.number= my_strntoul(my_charset_latin1,attr,len,10,(char**)NULL,&err);
     break;
   case _CS_COLNAME:
     i->cs.name=mstr(i->name,attr,len,MY_CS_NAME_SIZE-1);