maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2845
committer: Igor Babaev <igor@xxxxxxxxxxxx>
branch nick: maria-5.1
timestamp: Thu 2010-04-08 13:55:17 -0700
message:
  Fixed a problem of merge from mysql-5.1 baseline.
modified:
  sql/sql_select.cc


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription

=== modified file 'sql/sql_select.cc'
--- sql/sql_select.cc	2010-03-10 09:12:23 +0000
+++ sql/sql_select.cc	2010-04-08 20:55:17 +0000
@@ -2335,7 +2335,13 @@
 	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;