bk commit into 5.0 tree (ingo:1.1977)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing 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.1977 05/11/08 16:44:31 ingo@stripped +1 -0
  Merge istruewing@stripped:/home/bk/mysql-5.0
  into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0

  sql/field.cc
    1.290 05/11/08 16:44:28 ingo@stripped +0 -0
    Auto merged

# 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:	ingo
# Host:	production.mysql.com
# Root:	/usersnfs/istruewing/autopush/mysql-5.0/RESYNC

--- 1.289/sql/field.cc	2005-11-07 16:18:31 +01:00
+++ 1.290/sql/field.cc	2005-11-08 16:44:28 +01:00
@@ -6202,9 +6202,16 @@
     This is done to ensure that ALTER TABLE will convert old VARCHAR fields
     to now VARCHAR fields.
   */
-  return new Field_varstring(field_length, maybe_null(),
-                             field_name, new_table,
-                             charset());
+  Field *new_field= new Field_varstring(field_length, maybe_null(),
+                                        field_name, new_table,
+                                        charset());
+  /*
+    delayed_insert::get_local_table() needs a ptr copied from old table.
+    This is what other new_field() methods do too. The above method of
+    Field_varstring sets ptr to NULL.
+  */
+  new_field->ptr= ptr;
+  return new_field;
 }
 
 /****************************************************************************