bk commit into 4.1 tree (bell:1.2479)

[sanja]

Below is the list of changes that have just been committed into a local
4.1 repository of bell. When bell 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.2479 06/01/18 13:32:28 bell@stripped +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1

  sql/sql_select.cc
    1.448 06/01/18 13:32:24 bell@stripped +0 -0
    Auto merged

  sql/sql_class.cc
    1.204 06/01/18 13:32:24 bell@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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-bug8-4.1/RESYNC

--- 1.203/sql/sql_class.cc	2005-11-15 19:02:31 +02:00
+++ 1.204/sql/sql_class.cc	2006-01-18 13:32:24 +02:00
@@ -1681,7 +1681,10 @@
 
 void TMP_TABLE_PARAM::init()
 {
+  DBUG_ENTER("TMP_TABLE_PARAM::init");
+  DBUG_PRINT("enter", ("this: 0x%lx", (ulong)this));
   field_count= sum_func_count= func_count= hidden_field_count= 0;
   group_parts= group_length= group_null_parts= 0;
   quick_group= 1;
+  DBUG_VOID_RETURN;
 }

--- 1.447/sql/sql_select.cc	2006-01-17 20:40:33 +02:00
+++ 1.448/sql/sql_select.cc	2006-01-18 13:32:24 +02:00
@@ -950,7 +950,7 @@
     
     if (thd->lex->subqueries)
     {
-      if (!(tmp_join= (JOIN*)thd->alloc(sizeof(JOIN))))
+      if (!(tmp_join= new JOIN(*this)))
 	DBUG_RETURN(-1);
       error= 0;				// Ensure that tmp_join.error= 0
       restore_tmp();
@@ -4107,6 +4107,20 @@
       problems in free_elements() as some of the elements are then deleted.
     */
     tmp_table_param.copy_funcs.empty();
+    /*
+      If we have tmp_join and 'this' JOIN is not tmp_join and
+      tmp_table_param.copy_field's  of them are equal then we have to remove
+      pointer to  tmp_table_param.copy_field from tmp_join, because it qill
+      be removed in tmp_table_param.cleanup().
+    */
+    if (tmp_join &&
+        tmp_join != this &&
+        tmp_join->tmp_table_param.copy_field ==
+        tmp_table_param.copy_field)
+    {
+      tmp_join->tmp_table_param.copy_field=
+        tmp_join->tmp_table_param.save_copy_field= 0;
+    }
     tmp_table_param.cleanup();
   }
   DBUG_VOID_RETURN;