summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-06-25 23:20:46 +0200
committerunknown <serg@serg.mylan>2004-06-25 23:20:46 +0200
commitdbdca40549f9237893dfb872402a9e7f57084ef0 (patch)
tree4f623114fd99c10bd2f6cd6717d9491c93f1a4cb /sql/sql_select.cc
parent3b79bf10e2afc3029eae6c1cc8cc94f27850b7b6 (diff)
parent00567fe6342fc6cc60df0244ac5b0eeb1e792981 (diff)
downloadmariadb-git-dbdca40549f9237893dfb872402a9e7f57084ef0.tar.gz
merged
sql/sql_select.cc: Auto merged
Diffstat (limited to 'sql/sql_select.cc')
-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 a5de5397ec8..26ee225262b 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4128,6 +4128,8 @@ return_zero_rows(JOIN *join, select_result *result,TABLE_LIST *tables,
DBUG_RETURN(0);
}
+ join->join_free(0);
+
if (send_row)
{
for (TABLE_LIST *table=tables; table ; table=table->next)