bk commit into 4.1 tree (serg:1.1656)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1656 03/12/06 19:05:26 serg@stripped +8 -0
  fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
  (isn't it obvious ?)

  strings/ctype-ujis.c
    1.44 03/12/06 19:05:22 serg@stripped +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-sjis.c
    1.50 03/12/06 19:05:22 serg@stripped +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-gbk.c
    1.45 03/12/06 19:05:22 serg@stripped +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-gb2312.c
    1.41 03/12/06 19:05:22 serg@stripped +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-euc_kr.c
    1.44 03/12/06 19:05:22 serg@stripped +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-big5.c
    1.45 03/12/06 19:05:22 serg@stripped +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  sql/sql_load.cc
    1.62 03/12/06 19:05:22 serg@stripped +2 -3
    all charsets support my_mbcharlen - no need to protect it with use_mb()

  mysys/charset.c
    1.105 03/12/06 19:05:22 serg@stripped +1 -1
    all charsets support my_mbcharlen - no need to protect it with use_mb()

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.1

--- 1.104/mysys/charset.c	Tue Nov  4 08:40:33 2003
+++ 1.105/mysys/charset.c	Sat Dec  6 19:05:22 2003
@@ -82,7 +82,7 @@
     else if (my_isdigit(cs,i))
       state_map[i]=(uchar) MY_LEX_NUMBER_IDENT;
 #if defined(USE_MB) && defined(USE_MB_IDENT)
-    else if (use_mb(cs) && (my_mbcharlen(cs, i)>1))
+    else if (my_mbcharlen(cs, i)>1)
       state_map[i]=(uchar) MY_LEX_IDENT;
 #endif
     else if (!my_isgraph(cs,i))

--- 1.61/sql/sql_load.cc	Sat Oct 11 22:26:34 2003
+++ 1.62/sql/sql_load.cc	Sat Dec  6 19:05:22 2003
@@ -759,8 +759,7 @@
     {
       chr = GET;
 #ifdef USE_MB
-      if (use_mb(read_charset) &&
-          (my_mbcharlen(read_charset, chr) >1 )&&
+      if ((my_mbcharlen(read_charset, chr) > 1) &&
           to+my_mbcharlen(read_charset, chr) <= end_of_buff)
       {
 	  uchar* p = (uchar*)to;
@@ -946,7 +945,7 @@
   {
     int chr = GET;
 #ifdef USE_MB
-   if (use_mb(read_charset) && (my_mbcharlen(read_charset, chr) >1 ))
+   if (my_mbcharlen(read_charset, chr) > 1)
    {
        for (int i=1;
             chr != my_b_EOF && i<my_mbcharlen(read_charset, chr);

--- 1.44/strings/ctype-big5.c	Fri Sep 19 12:18:16 2003
+++ 1.45/strings/ctype-big5.c	Sat Dec  6 19:05:22 2003
@@ -401,7 +401,7 @@
 
 static int mbcharlen_big5(CHARSET_INFO *cs __attribute__((unused)), uint c)
 {
-  return (isbig5head(c)? 2: 0);
+  return (isbig5head(c)? 2 : 1);
 }
 
 /* page 0 0xA140-0xC7FC */

--- 1.43/strings/ctype-euc_kr.c	Fri Sep 19 12:18:16 2003
+++ 1.44/strings/ctype-euc_kr.c	Sat Dec  6 19:05:22 2003
@@ -193,7 +193,7 @@
 
 static int mbcharlen_euc_kr(CHARSET_INFO *cs __attribute__((unused)),uint c)
 {
-  return (iseuc_kr(c) ? 2 : 0);
+  return (iseuc_kr(c) ? 2 : 1);
 }
 
 

--- 1.40/strings/ctype-gb2312.c	Fri Sep 19 12:18:16 2003
+++ 1.41/strings/ctype-gb2312.c	Sat Dec  6 19:05:22 2003
@@ -174,7 +174,7 @@
 
 static int mbcharlen_gb2312(CHARSET_INFO *cs __attribute__((unused)),uint c)
 {
-  return (isgb2312head(c)? 2:0);
+  return (isgb2312head(c)? 2 : 1);
 }
 
 

--- 1.44/strings/ctype-gbk.c	Fri Sep 19 12:18:16 2003
+++ 1.45/strings/ctype-gbk.c	Sat Dec  6 19:05:22 2003
@@ -2721,7 +2721,7 @@
 
 static int mbcharlen_gbk(CHARSET_INFO *cs __attribute__((unused)),uint c)
 {
-  return (isgbkhead(c)? 2:0);
+  return (isgbkhead(c)? 2 : 1);
 }
 
 /* page 0 0x8140-0xFE4F */

--- 1.49/strings/ctype-sjis.c	Fri Sep 19 12:18:16 2003
+++ 1.50/strings/ctype-sjis.c	Sat Dec  6 19:05:22 2003
@@ -191,7 +191,7 @@
 
 static int mbcharlen_sjis(CHARSET_INFO *cs __attribute__((unused)),uint c)
 {
-  return (issjishead((uchar) c) ? 2: 0);
+  return (issjishead((uchar) c) ? 2 : 1);
 }
 
 

--- 1.43/strings/ctype-ujis.c	Fri Sep 19 12:18:16 2003
+++ 1.44/strings/ctype-ujis.c	Sat Dec  6 19:05:22 2003
@@ -196,7 +196,7 @@
 
 static int mbcharlen_ujis(CHARSET_INFO *cs __attribute__((unused)),uint c)
 {
-  return (isujis(c)? 2: isujis_ss2(c)? 2: isujis_ss3(c)? 3: 0);
+  return (isujis(c)? 2: isujis_ss2(c)? 2: isujis_ss3(c)? 3: 1);
 }