bk commit into 5.1 tree (istruewing:1.2336)

[ingo]

Below is the list of changes that have just been committed into a local
5.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-20 14:36:32+02:00, istruewing@stripped +4 -0
  Merge chilla.local:/home/mydev/mysql-5.1--team
  into  chilla.local:/home/mydev/mysql-5.1-tomain
  MERGE: 1.2330.1.6

  mysql-test/r/innodb_mysql.result@stripped, 2006-09-20 14:36:29+02:00, istruewing@stripped +0 -2
    Manual merge from 5.1-engines.
    MERGE: 1.7.1.4

  mysql-test/t/disabled.def@stripped, 2006-09-20 14:25:52+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.196.1.1

  sql/opt_range.cc@stripped, 2006-09-20 14:25:53+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.232.1.3

  sql/sql_select.cc@stripped, 2006-09-20 14:25:53+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.439.1.1

# 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-5.1-tomain/RESYNC

--- 1.233/sql/opt_range.cc	2006-09-20 14:36:39 +02:00
+++ 1.234/sql/opt_range.cc	2006-09-20 14:36:39 +02:00
@@ -1165,11 +1165,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_
   }
 
   thd= head->in_use;
-  if (!(file= get_new_handler(head->s, thd->mem_root, head->s->db_type)))
-    goto failure;
-  DBUG_PRINT("info", ("Allocated new handler 0x%lx", (long) file));
-  if (file->ha_open(head, head->s->normalized_path.str, head->db_stat,
-                    HA_OPEN_IGNORE_IF_LOCKED))
+  if (!(file= head->file->clone(thd->mem_root)))
   {
     /* Caller will free the memory */
     goto failure;

--- 1.440/sql/sql_select.cc	2006-09-20 14:36:39 +02:00
+++ 1.441/sql/sql_select.cc	2006-09-20 14:36:39 +02:00
@@ -13484,6 +13484,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PA
   param->copy_funcs.empty();
   for (i= 0; (pos= li++); i++)
   {
+    Field *field;
+    char *tmp;
     Item *real_pos= pos->real_item();
     if (real_pos->type() == Item::FIELD_ITEM)
     {
@@ -13514,17 +13516,25 @@ 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, 1);
-	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;
-      if (copy)
-      {
-        copy->set(tmp, item->result_field);
-        item->result_field->move_field(copy->to_ptr,copy->to_null_ptr,1);
-        copy++;
-      }				
+        if (copy)
+        {
+          copy->set(tmp, item->result_field);
+          item->result_field->move_field(copy->to_ptr,copy->to_null_ptr,1);
+#ifdef HAVE_purify
+          copy->to_ptr[copy->from_length]= 0;
+#endif
+          copy++;
+        }
       }
     }
     else if ((real_pos->type() == Item::FUNC_ITEM ||

--- 1.11/mysql-test/r/innodb_mysql.result	2006-09-20 14:36:39 +02:00
+++ 1.12/mysql-test/r/innodb_mysql.result	2006-09-20 14:36:39 +02:00
@@ -125,7 +125,7 @@ min(7)
 NULL
 select min(7) from DUAL;
 min(7)
-NULL
+7
 explain select min(7) from t2i join t1i;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	
@@ -141,7 +141,7 @@ max(7)
 NULL
 select max(7) from DUAL;
 max(7)
-NULL
+7
 explain select max(7) from t2i join t1i;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	

--- 1.203/mysql-test/t/disabled.def	2006-09-20 14:36:39 +02:00
+++ 1.204/mysql-test/t/disabled.def	2006-09-20 14:36:39 +02:00
@@ -35,7 +35,6 @@ rpl_ndb_innodb2ndb       : Bug #19710  C
 rpl_ndb_myisam2ndb       : Bug #19710  Cluster replication to partition table fails on DELETE FROM statement
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_sp                   : BUG#16456 2006-02-16 jmiller
-rpl_sp_effects           : BUG#19862 2006-06-15 mkindahl
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events