summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-06-27 12:26:24 +0200
committerunknown <msvensson@neptunus.(none)>2005-06-27 12:26:24 +0200
commit5ae1fd9d0dd446b698222f5442c227210f012548 (patch)
treea068627198d0c3637c1dce7460adb6ad5bdfb4ed
parent74586e95fc3065e33162364886672ac49c5ea54e (diff)
parent48cb6de7d9c89bbe85f6676c31f5c4fbfcc6af00 (diff)
downloadmariadb-git-5ae1fd9d0dd446b698222f5442c227210f012548.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-rw-r--r--sql/sql_select.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index b487637ba9c..13c5c7cd716 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5986,6 +5986,8 @@ void JOIN::cleanup(bool full)
*/
if (full)
{
+ if (tmp_join)
+ tmp_table_param.copy_field= 0;
group_fields.delete_elements();
/*
We can't call delete_elements() on copy_funcs as this will cause