diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2008-10-02 13:10:06 +0500 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2008-10-02 13:10:06 +0500 |
| commit | 1ce81aac15f0e7a89aef78f8e25ec7976f37972c (patch) | |
| tree | 0c7ed2ea227afd90471853f9cc4cc08c79549230 /sql/sp_head.cc | |
| parent | d3e317d16befe9e6d7ade3e0527dca10609577ad (diff) | |
| parent | 652565d3622d2c6a81313aa6faf5e44fd2c9d57b (diff) | |
| download | mariadb-git-1ce81aac15f0e7a89aef78f8e25ec7976f37972c.tar.gz | |
merge
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 8245e8bee89..3ec6dd5cf06 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1765,7 +1765,11 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) we'll leave it here. */ if (!thd->in_sub_stmt) - close_thread_tables(thd, 0, 0); + { + thd->lex->unit.cleanup(); + close_thread_tables(thd); + thd->rollback_item_tree_changes(); + } DBUG_PRINT("info",(" %.*s: eval args done", m_name.length, m_name.str)); } |