bk commit into 5.0 tree (serg:1.1885)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1885 05/04/06 23:12:10 serg@stripped +5 -0
  after merge fix

  strings/ctype-eucjpms.c
    1.5 05/04/06 23:12:02 serg@stripped +7 -4
    after merge fix

  strings/ctype-cp932.c
    1.5 05/04/06 23:12:01 serg@stripped +3 -1
    after merge fix

  ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
    1.16 05/04/06 23:12:01 serg@stripped +2 -1
    after merge fix

  mysql-test/t/user_var.test
    1.27 05/04/06 23:12:01 serg@stripped +1 -2
    after merge fixes - old (erroneous) results restored.
    Should be corrected when the fix is applied

  mysql-test/r/user_var.result
    1.32 05/04/06 23:12:01 serg@stripped +1 -2
    after merge fixes - old (erroneous) results restored.
    Should be corrected when the fix is applied

# 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-5.0

--- 1.15/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	Thu Jan 13 18:24:05 2005
+++ 1.16/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	Wed Apr  6 23:12:01 2005
@@ -813,6 +813,7 @@
         ndbrequire(i < regTabPtr->noOfCharsets);
         // not const in MySQL
         CHARSET_INFO* cs = regTabPtr->charsetArray[i];
+        int not_used;
         const char* ssrc = (const char*)&inBuffer[tInBufIndex + 1];
         Uint32 lb, len;
         if (! NdbSqlUtil::get_var_length(typeId, ssrc, bytes, lb, len)) {
@@ -822,7 +823,7 @@
         }
 	// fast fix bug#7340
         if (typeId != NDB_TYPE_TEXT &&
-	    (*cs->cset->well_formed_len)(cs, ssrc + lb, ssrc + lb + len, ZNIL) != len) {
+	    (*cs->cset->well_formed_len)(cs, ssrc + lb, ssrc + lb + len, ZNIL, &not_used) != len) {
           ljam();
           terrorCode = ZINVALID_CHAR_FORMAT;
           return false;

--- 1.31/mysql-test/r/user_var.result	Wed Apr  6 20:29:11 2005
+++ 1.32/mysql-test/r/user_var.result	Wed Apr  6 23:12:01 2005
@@ -180,6 +180,5 @@
 coercibility(@v1)	coercibility(@v2)	coercibility(@v3)	coercibility(@v4)
 2	2	2	2
 set session @honk=99;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1
 set one_shot @honk=99;
-ERROR HY000: The SET ONE_SHOT syntax is reserved for purposes internal to the MySQL server
+ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server

--- 1.26/mysql-test/t/user_var.test	Wed Apr  6 20:29:11 2005
+++ 1.27/mysql-test/t/user_var.test	Wed Apr  6 23:12:01 2005
@@ -116,7 +116,6 @@
 #
 # Bug #9286  SESSION/GLOBAL should be disallowed for user variables
 #
---error 1064
 set session @honk=99;
---error 1105
+--error 1382
 set one_shot @honk=99;

--- 1.4/strings/ctype-cp932.c	Wed Jan 26 13:34:02 2005
+++ 1.5/strings/ctype-cp932.c	Wed Apr  6 23:12:01 2005
@@ -5413,9 +5413,10 @@
 */
 static
 uint my_well_formed_len_cp932(CHARSET_INFO *cs __attribute__((unused)),
-                             const char *b, const char *e, uint pos)
+                             const char *b, const char *e, uint pos, int *error)
 {
   const char *b0= b;
+  *error= 0;
   while (pos && b < e)
   {
     /*
@@ -5441,6 +5442,7 @@
     else
     {
       /* Wrong byte sequence */
+      *error= 1;
       break;
     }
   }

--- 1.4/strings/ctype-eucjpms.c	Wed Jan 26 13:34:03 2005
+++ 1.5/strings/ctype-eucjpms.c	Wed Apr  6 23:12:02 2005
@@ -8380,17 +8380,18 @@
 
 /*
   EUC-JP encoding subcomponents:
-  [x00-x7F]			# ASCII/JIS-Roman (one-byte/character)  
-  [x8E][xA0-xDF]		# half-width katakana (two bytes/char)  
-  [x8F][xA1-xFE][xA1-xFE]	# JIS X 0212-1990 (three bytes/char)  
+  [x00-x7F]			# ASCII/JIS-Roman (one-byte/character)
+  [x8E][xA0-xDF]		# half-width katakana (two bytes/char)
+  [x8F][xA1-xFE][xA1-xFE]	# JIS X 0212-1990 (three bytes/char)
   [xA1-xFE][xA1-xFE]		# JIS X 0208:1997 (two bytes/char)
 */
 
 static
 uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
-                             const char *beg, const char *end, uint pos)
+                             const char *beg, const char *end, uint pos, int *error)
 {
   const uchar *b= (uchar *) beg;
+  *error=0;
 
   for ( ; pos && b < (uchar*) end; pos--, b++)
   {
@@ -8408,6 +8409,7 @@
     {
       if (*b >= 0xA0 && *b <= 0xDF)
         continue;
+      *error=1;
       return chbeg - beg;           /* invalid sequence */
     }
 
@@ -8421,6 +8423,7 @@
     if (ch >= 0xA1 && ch <= 0xFE &&
         *b >= 0xA1 && *b <= 0xFE)   /* [xA1-xFE][xA1-xFE] */
       continue;
+    *error=1;
     return chbeg - beg;             /* invalid sequence */
   }
   return b - (uchar *) beg;