bk commit into 4.1 tree (istruewing:1.2547)

[ingo]

Below is the list of changes that have just been committed into a local
4.1 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@stripped, 2006-09-19 10:17:25+02:00, istruewing@stripped +6 -0
  Merge bk-internal:/home/bk/mysql-4.0
  into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
  MERGE: 1.1346.1.847

  BitKeeper/etc/ignore@stripped, 2006-09-19 10:01:06+02:00, istruewing@stripped +6 -6
    auto-union
    MERGE: 1.107.1.61

  include/my_global.h@stripped, 2006-09-19 10:01:08+02:00, istruewing@stripped +0 -1
    Auto merged
    MERGE: 1.34.1.41

  myisam/mi_rkey.c@stripped, 2006-09-19 10:17:23+02:00, istruewing@stripped +0 -1
    Manual null merge as a better fix is already present.
    MERGE: 1.11.1.5

  mysql-test/r/myisam.result@stripped, 2006-09-19 10:17:23+02:00, istruewing@stripped +0 -15
    Manual null merge as a better fix is already present.
    MERGE: 1.10.1.22

  mysql-test/t/myisam.test@stripped, 2006-09-19 10:17:23+02:00, istruewing@stripped +0 -0
    Manual null merge as a better fix is already present.
    MERGE: 1.7.1.21

  sql/sql_select.cc@stripped, 2006-09-19 10:17:23+02:00, istruewing@stripped +11 -13
    Manual merge of purify improvements.
    MERGE: 1.152.1.144

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-4.1-bug14400-monty/RESYNC

--- 1.21/myisam/mi_rkey.c	2006-09-19 10:17:29 +02:00
+++ 1.22/myisam/mi_rkey.c	2006-09-19 10:17:29 +02:00
@@ -132,7 +132,6 @@ int mi_rkey(MI_INFO *info, byte *buf, in
       }
     }
   }
-
   if (share->concurrent_insert)
     rw_unlock(&share->key_root_lock[inx]);
 

--- 1.453/sql/sql_select.cc	2006-09-19 10:17:29 +02:00
+++ 1.454/sql/sql_select.cc	2006-09-19 10:17:29 +02:00
@@ -9083,6 +9083,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PA
   param->copy_funcs.empty();
   for (i= 0; (pos= li++); i++)
   {
+    Field *field;
+    char *tmp;
     if (pos->type() == Item::FIELD_ITEM)
     {
       Item_field *item;
@@ -9111,14 +9113,22 @@ setup_copy_fields(THD *thd, TMP_TABLE_PA
 	   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 ||

--- 1.235/BitKeeper/etc/ignore	2006-09-19 10:17:29 +02:00
+++ 1.236/BitKeeper/etc/ignore	2006-09-19 10:17:29 +02:00
@@ -1,3 +1,5 @@
+*.Plo
+*.Po
 *.a
 *.bb
 *.bbg
@@ -11,6 +13,8 @@
 *.reject
 *.spec
 */*_pure_*warnings
+*/.deps
+*/.libs/*
 */.pure
 *~
 .*.swp
@@ -336,6 +340,7 @@ isam/test2
 isam/test3
 libmysql/*.c
 libmysql/conf_to_src
+libmysql/libmysql.ver
 libmysql/my_static.h
 libmysql/my_time.c
 libmysql/mysys_priv.h
@@ -443,6 +448,7 @@ libmysqld/sql_insert.cc
 libmysqld/sql_lex.cc
 libmysqld/sql_list.cc
 libmysqld/sql_load.cc
+libmysqld/sql_locale.cc
 libmysqld/sql_manager.cc
 libmysqld/sql_map.cc
 libmysqld/sql_olap.cc
@@ -1057,5 +1063,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-libmysql/libmysql.ver
-libmysqld/sql_locale.cc