summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-09-17 19:08:46 +0300
committerbell@sanja.is.com.ua <>2004-09-17 19:08:46 +0300
commitf11bcefae18a93cabf4c23e3939731cf86ba9b15 (patch)
tree022a3cf7464979f652d1c7ab9f1cd44108d5a639 /sql/sql_derived.cc
parentd2474ee2e58fe2dea6adff6a9f47987f07811ea0 (diff)
downloadmariadb-git-f11bcefae18a93cabf4c23e3939731cf86ba9b15.tar.gz
fixed error handling if creating derived table failed
single row subquery always can return NULL (no rows found) (BUG#5590)
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r--sql/sql_derived.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 05ad2094372..906ef646f47 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -224,7 +224,10 @@ static int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
}
}
else
+ {
free_tmp_table(thd, table);
+ thd->lex->unit.cleanup();
+ }
exit:
delete derived_result;