summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-09-04 12:39:56 +0500
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-09-04 12:39:56 +0500
commit79b5063ddf9eedab8a5e9de7ef9815c4ef9aa9c7 (patch)
treed6f739c91f36fac30c9197389a91a41b71818ef4 /sql/sql_select.cc
parent7bfdc5bbf5cd0ffb9e35d19d80ac9aa527938ba1 (diff)
parent643fbe4234a06e51746c8912223652a3b41fe133 (diff)
downloadmariadb-git-79b5063ddf9eedab8a5e9de7ef9815c4ef9aa9c7.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 1a6dc7f04c8..4e50191be6b 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2252,7 +2252,7 @@ JOIN::destroy()
tab->cleanup();
}
tmp_join->tmp_join= 0;
- tmp_table_param.copy_field=0;
+ tmp_table_param.cleanup();
DBUG_RETURN(tmp_join->destroy());
}
cond_equal= 0;