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

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1

include/m_ctype.h

@@ -120,10 +120,8 @@ extern void my_casedn_8bit(CHARSET_INFO *, char *, uint);
 extern int my_strcasecmp_8bit(CHARSET_INFO * cs, const char *, const char *);
 extern int my_strncasecmp_8bit(CHARSET_INFO * cs, const char *, const char *, uint);
 
-int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc,
-		  const unsigned char *s,const unsigned char *e);
-int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc,
-		  unsigned char *s, unsigned char *e);
+int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
+int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
 
 
 #ifdef USE_MB
@@ -146,6 +144,8 @@ extern my_bool my_like_range_big5(CHARSET_INFO *,const char *, uint, pchar, uint
 extern int     ismbchar_big5(CHARSET_INFO *, const char *, const char *);
 extern my_bool ismbhead_big5(CHARSET_INFO *, uint);
 extern int     mbcharlen_big5(CHARSET_INFO *, uint);
+int my_mb_wc_big5(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
+int my_wc_mb_big5(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
 #endif
 
 #ifdef HAVE_CHARSET_czech
@@ -164,6 +164,8 @@ extern uchar ctype_euc_kr[], to_lower_euc_kr[], to_upper_euc_kr[], sort_order_eu
 extern int     ismbchar_euc_kr(CHARSET_INFO *, const char *, const char *);
 extern my_bool ismbhead_euc_kr(CHARSET_INFO *, uint);
 extern int     mbcharlen_euc_kr(CHARSET_INFO *, uint);
+int my_mb_wc_euc_kr(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
+int my_wc_mb_euc_kr(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
 #endif
 
 #ifdef HAVE_CHARSET_gb2312
@@ -172,6 +174,8 @@ extern uchar ctype_gb2312[], to_lower_gb2312[], to_upper_gb2312[], sort_order_gb
 extern int     ismbchar_gb2312(CHARSET_INFO *, const char *, const char *);
 extern my_bool ismbhead_gb2312(CHARSET_INFO *, uint);
 extern int     mbcharlen_gb2312(CHARSET_INFO *, uint);
+int my_mb_wc_gb2312(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
+int my_wc_mb_gb2312(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
 #endif
 
 #ifdef HAVE_CHARSET_gbk
@@ -184,6 +188,8 @@ extern my_bool my_like_range_gbk(CHARSET_INFO *, const char *, uint, pchar, uint
 extern int     ismbchar_gbk(CHARSET_INFO *, const char *, const char *);
 extern my_bool ismbhead_gbk(CHARSET_INFO *, uint);
 extern int     mbcharlen_gbk(CHARSET_INFO *, uint);
+int my_mb_wc_gbk(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
+int my_wc_mb_gbk(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
 #endif
 
 #ifdef HAVE_CHARSET_latin1_de
@@ -205,6 +211,8 @@ extern my_bool my_like_range_sjis(CHARSET_INFO *, const char *, uint, pchar, uin
 extern int     ismbchar_sjis(CHARSET_INFO *, const char *, const char *);
 extern my_bool ismbhead_sjis(CHARSET_INFO *, uint);
 extern int     mbcharlen_sjis(CHARSET_INFO *, uint);
+int my_mb_wc_sjis(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
+int my_wc_mb_sjis(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
 #endif
 
 #ifdef HAVE_CHARSET_tis620
@@ -222,6 +230,8 @@ extern uchar ctype_ujis[], to_lower_ujis[], to_upper_ujis[], sort_order_ujis[];
 extern int     ismbchar_ujis(CHARSET_INFO *, const char *, const char *);
 extern my_bool ismbhead_ujis(CHARSET_INFO *, uint);
 extern int     mbcharlen_ujis(CHARSET_INFO *, uint);
+int my_mb_wc_euc_jp(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
+int my_wc_mb_euc_jp(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
 #endif
 
 #ifdef HAVE_CHARSET_utf8

sql/init.cc

@@ -60,7 +60,7 @@ void unireg_init(ulong options)
     uchar max_char;
     if (!cs->sort_order)
       continue;
-    cs->sort_order[(uchar) cs->max_sort_char];
+    max_char=cs->sort_order[(uchar) cs->max_sort_char];
     for (i = 0; i < 256; i++)
     {
       if ((uchar) cs->sort_order[i] > max_char)

sql/item_strfunc.cc

@@ -1782,7 +1782,7 @@ String *Item_func_conv_charset::val_str(String *str)
   int cnvres;
   const uchar *s, *se;
   uchar *d, *d0, *de;
-  uint dmaxlen;
+  uint32 dmaxlen;
   String *arg= args[0]->val_str(str);
   CHARSET_INFO *from,*to;
   
@@ -1833,7 +1833,7 @@ String *Item_func_conv_charset::val_str(String *str)
       break;
   };
   
-  str->length((uint) (d-d0));
+  str->length((uint32) (d-d0));
   str->set_charset(to);
   return str;
 }
@@ -1850,7 +1850,7 @@ String *Item_func_conv_charset3::val_str(String *str)
   int cnvres;
   const uchar *s, *se;
   uchar *d, *d0, *de;
-  uint dmaxlen;
+  uint32 dmaxlen;
   String *arg= args[0]->val_str(str);
   String *to_cs= args[1]->val_str(str);
   String *from_cs= args[2]->val_str(str);
@@ -1905,7 +1905,7 @@ String *Item_func_conv_charset3::val_str(String *str)
       break;
   };
   
-  str->length((uint) (d-d0));
+  str->length((uint32) (d-d0));
   str->set_charset(to_charset);
   return str;
 }

strings/ctype.c

@@ -2848,8 +2848,8 @@ CHARSET_INFO compiled_charsets[] = {
     ismbchar_big5,
     ismbhead_big5,
     mbcharlen_big5,
-    NULL,		/* mb_wc      */
-    NULL,		/* wc_mb      */
+    my_mb_wc_big5,	/* mb_wc      */
+    my_wc_mb_big5,	/* wc_mb      */
     my_caseup_str_mb,
     my_casedn_str_mb,
     my_caseup_mb,
@@ -3582,24 +3582,24 @@ CHARSET_INFO compiled_charsets[] = {
 
 #ifdef HAVE_CHARSET_ujis
   {
-    12,    /* number */
-    "ujis",     /* name */
+    12,			/* number       */
+    "ujis",		/* name         */
     ctype_ujis,
     to_lower_ujis,
     to_upper_ujis,
     sort_order_ujis,
-    NULL,	/* tab_to_uni   */
-    NULL,	/* tab_from_uni */
-    0,	  /* strxfrm_multiply */
-    NULL,		 /* strnncoll  */
-    NULL,		 /* strnxfrm   */
-    NULL,		 /* like_range */
-    3,		/* mbmaxlen */
+    NULL,		/* tab_to_uni   */
+    NULL,		/* tab_from_uni */
+    0,			/* strxfrm_multiply */
+    NULL,		/* strnncoll    */
+    NULL,		/* strnxfrm     */
+    NULL,		/* like_range   */
+    3,			/* mbmaxlen     */
     ismbchar_ujis,
     ismbhead_ujis,
     mbcharlen_ujis,
-    NULL,		 /* mb_wc		*/
-    NULL,		 /* wc_mb      */
+    my_mb_wc_euc_jp,	 /* mb_wc       */
+    my_wc_mb_euc_jp,	 /* wc_mb       */
     my_caseup_str_mb,
     my_casedn_str_mb,
     my_caseup_mb,
@@ -3612,24 +3612,24 @@ CHARSET_INFO compiled_charsets[] = {
 
 #ifdef HAVE_CHARSET_utf8
   {
-    33,			/* number    */
-    "utf8",		/* name      */
-    ctype_utf8,		/* ctype     */
-    to_lower_utf8,	/* to_lower  */
-    to_upper_utf8,	/* to_upper  */
-    to_upper_utf8,	/* sort_order */
+    33,			/* number       */
+    "utf8",		/* name         */
+    ctype_utf8,		/* ctype        */
+    to_lower_utf8,	/* to_lower     */
+    to_upper_utf8,	/* to_upper     */
+    to_upper_utf8,	/* sort_order   */
     NULL,		/* tab_to_uni   */
     NULL,		/* tab_from_uni */
     1,			/* strxfrm_multiply */
-    my_strnncoll_utf8,	/* strnncoll  */
-    my_strnxfrm_utf8,	/* strnxfrm   */
-    NULL,		/* like_range */
-    6,			/* mbmaxlen  */
-    my_ismbchar_utf8,	/* ismbchar  */
-    my_ismbhead_utf8,	/* ismbhead  */
-    my_mbcharlen_utf8,	/* mbcharlen */
-    my_utf8_uni,	/* mb_wc      */
-    my_uni_utf8,	/* wc_mb      */
+    my_strnncoll_utf8,	/* strnncoll    */
+    my_strnxfrm_utf8,	/* strnxfrm     */
+    NULL,		/* like_range   */
+    6,			/* mbmaxlen     */
+    my_ismbchar_utf8,	/* ismbchar     */
+    my_ismbhead_utf8,	/* ismbhead     */
+    my_mbcharlen_utf8,	/* mbcharlen    */
+    my_utf8_uni,	/* mb_wc        */
+    my_uni_utf8,	/* wc_mb        */
     my_caseup_str_utf8,
     my_casedn_str_utf8,
     my_caseup_utf8,