bk commit into 5.0 tree (konstantin:1.2081) BUG#13134

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.2081 06/02/24 00:12:04 konstantin@stripped +2 -0
  After-merge fixes (Bug#13134)

  sql/sql_parse.cc
    1.528 06/02/24 00:11:57 konstantin@stripped +0 -1
    After-merge fixes (Bug#13134)

  sql/field.cc
    1.299 06/02/24 00:11:57 konstantin@stripped +3 -1
    After-merge fixes (Bug#13134)

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-runtime

--- 1.298/sql/field.cc	2006-02-24 00:00:01 +03:00
+++ 1.299/sql/field.cc	2006-02-24 00:11:57 +03:00
@@ -8269,7 +8269,7 @@
 {
   field_name= "";
   sql_type= sql_type_arg;
-  length= length_arg;;
+  char_length= length= length_arg;;
   unireg_check= Field::NONE;
   interval= 0;
   charset= &my_charset_bin;
@@ -8597,6 +8597,8 @@
   case FIELD_TYPE_DECIMAL:
     DBUG_ASSERT(0); /* Was obsolete */
   }
+  /* Remember the value of length */
+  char_length= length;
 
   if (!(flags & BLOB_FLAG) &&
       ((length > max_field_charlength && fld_type != FIELD_TYPE_SET &&

--- 1.527/sql/sql_parse.cc	2006-02-24 00:00:01 +03:00
+++ 1.528/sql/sql_parse.cc	2006-02-24 00:11:57 +03:00
@@ -5791,7 +5791,6 @@
                       interval_list, cs, uint_geom_type))
     DBUG_RETURN(1);
 
-  new_field->char_length= new_field->length;
   lex->create_list.push_back(new_field);
   lex->last_field=new_field;
   DBUG_RETURN(0);