bk commit into 4.1 tree (bar:1.2165)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar 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.2165 05/04/06 15:12:44 bar@stripped +2 -0
  Minor clean-ups for the previous commit.

  strings/ctype-mb.c
    1.39 05/04/06 15:12:35 bar@stripped +1 -1
    Don't return an error if we reached end of line.

  sql/field.cc
    1.215 05/04/06 15:12:35 bar@stripped +4 -4
    Use a separate variable. Otherwise "error" value gets lost
    after well_formed_length call.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.214/sql/field.cc	2005-04-06 11:53:08 +05:00
+++ 1.215/sql/field.cc	2005-04-06 15:12:35 +05:00
@@ -4914,7 +4914,7 @@
 
 int Field_string::store(const char *from,uint length,CHARSET_INFO *cs)
 {
-  int error= 0;
+  int error= 0, well_formed_error;
   uint32 not_used;
   char buff[80];
   String tmpstr(buff,sizeof(buff), &my_charset_bin);
@@ -4942,7 +4942,7 @@
                                                     from,from+length,
                                                     field_length/
                                                     field_charset->mbmaxlen,
-                                                    &error);
+                                                    &well_formed_error);
   memcpy(ptr,from,copy_length);
   if (copy_length < field_length)	// Append spaces if shorter
     field_charset->cset->fill(field_charset,ptr+copy_length,
@@ -5545,7 +5545,7 @@
 
 int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs)
 {
-  int error= 0;
+  int error= 0, well_formed_error;
   if (!length)
   {
     bzero(ptr,Field_blob::pack_length());
@@ -5580,7 +5580,7 @@
                                                       from,from +
                                                       min(length, copy_length),
                                                       copy_length,
-                                                      &error);
+                                                      &well_formed_error);
     if (copy_length < length)
       error= 1;
     Field_blob::store_length(copy_length);

--- 1.38/strings/ctype-mb.c	2005-04-06 11:53:08 +05:00
+++ 1.39/strings/ctype-mb.c	2005-04-06 15:12:35 +05:00
@@ -276,7 +276,7 @@
 
     if ((mblen= cs->cset->mb_wc(cs, &wc, (uchar*) b, (uchar*) e)) <= 0)
     {
-      *error= 1;
+      *error= b < e ? 1 : 0;
       break;
     }
     b+= mblen;