diff options
author | Alexey Botchkov <holyfoot@mysql.com> | 2008-09-30 10:41:30 +0500 |
---|---|---|
committer | Alexey Botchkov <holyfoot@mysql.com> | 2008-09-30 10:41:30 +0500 |
commit | b8734a1ce2d835729ffaf0058aaf75275c88aaca (patch) | |
tree | 8a16772a4457293b0a451ce254d10697da8c8b7d /sql/sp_head.cc | |
parent | 1e26e74c2a7192e4b8c94210b1e9829f7e53b2f1 (diff) | |
parent | ce64a16b75746848c8d5a89cfb726a38691c9d6f (diff) | |
download | mariadb-git-b8734a1ce2d835729ffaf0058aaf75275c88aaca.tar.gz |
merging
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r-- | sql/sp_head.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index d1f920fd3a5..cf6610dfa11 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1940,7 +1940,11 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) we'll leave it here. */ if (!thd->in_sub_stmt) - close_thread_tables(thd); + { + thd->lex->unit.cleanup(); + close_thread_tables(thd); + thd->rollback_item_tree_changes(); + } DBUG_PRINT("info",(" %.*s: eval args done", (int) m_name.length, m_name.str)); |