maria-developers team mailing list archive

[<serg@xxxxxxxxxxxx>]

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2783 [merge]
revision-id: sergii@xxxxxxxxx-20100408210307-j82aap23b14h7j3t
parent: sergii@xxxxxxxxx-20100408171901-npw9ltfhwwma6kvi
parent: igor@xxxxxxxxxxxx-20100408205517-43ppipg5lrwlnk5u
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: 5.2
timestamp: Thu 2010-04-08 23:03:07 +0200
message:
  merged
modified:
  sql/sql_select.cc              sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-03-15 11:51:23 +0000
+++ b/sql/sql_select.cc	2010-04-08 21:03:07 +0000
@@ -2335,7 +2335,13 @@ JOIN::destroy()
         tab->cleanup();
     }
     tmp_join->tmp_join= 0;
+    /*
+      We need to clean up tmp_table_param for reusable JOINs (having non-zero
+      and different from self tmp_join) because it's not being cleaned up
+      anywhere else (as we need to keep the join is reusable).
+    */
     tmp_table_param.cleanup();
+    tmp_join->tmp_table_param.copy_field= 0;
     DBUG_RETURN(tmp_join->destroy());
   }
   cond_equal= 0;