bk commit into 4.1 tree (gkodinov:1.2552)

[gkodinov]

Below is the list of changes that have just been committed into a local
4.1 repository of gkodinov. When gkodinov 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@stripped, 2006-09-28 10:19:25+02:00, gkodinov@stripped +1 -0
  Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
  into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
  MERGE: 1.2543.1.31

  sql/sql_select.cc@stripped, 2006-09-28 10:19:22+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.457.1.2

# 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:	gkodinov
# Host:	dl145s.mysql.com
# Root:	/data/bk/team_tree_merge/MERGE/mysql-4.1-opt/RESYNC

--- 1.458/sql/sql_select.cc	2006-09-28 10:19:27 +02:00
+++ 1.459/sql/sql_select.cc	2006-09-28 10:19:27 +02:00
@@ -9104,6 +9104,8 @@
   param->copy_funcs.empty();
   for (i= 0; (pos= li++); i++)
   {
+    Field *field;
+    char *tmp;
     if (pos->type() == Item::FIELD_ITEM)
     {
       Item_field *item;
@@ -9132,14 +9134,22 @@
 	   set up save buffer and change result_field to point at 
 	   saved value
 	*/
-	Field *field= item->field;
+	field= item->field;
 	item->result_field=field->new_field(thd->mem_root,field->table);
-	char *tmp=(char*) sql_alloc(field->pack_length()+1);
+        /*
+          We need to allocate one extra byte for null handling and
+          another extra byte to not get warnings from purify in
+          Field_string::val_int
+        */
+	tmp= (char*) sql_alloc(field->pack_length()+2);
 	if (!tmp)
 	  goto err;
 	copy->set(tmp, item->result_field);
 	item->result_field->move_field(copy->to_ptr,copy->to_null_ptr,1);
-	copy++;
+#ifdef HAVE_purify
+        copy->to_ptr[copy->from_length]= 0;
+#endif
+        copy++;
       }
     }
     else if ((pos->type() == Item::FUNC_ITEM ||