diff options
| author | unknown <pem@mysql.com> | 2005-02-18 17:46:30 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-02-18 17:46:30 +0100 |
| commit | a860439789048bb76a805d776d6cc777ff93a0e2 (patch) | |
| tree | 3aee490b6ffd2691a8faadcc54234969b19c8dec /sql/sp_head.cc | |
| parent | a88f5e4062ebde25c42649f7e77c95bd0354458c (diff) | |
| parent | dba087530487103fbaa432a08b78ae4a19bf89e7 (diff) | |
| download | mariadb-git-a860439789048bb76a805d776d6cc777ff93a0e2.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 26fb94e5234..4c03e88f33a 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1251,6 +1251,7 @@ sp_instr_stmt::exec_stmt(THD *thd, LEX *lex) res= mysql_execute_command(thd); lex->unit.cleanup(); + thd->rollback_item_tree_changes(); if (thd->lock || thd->open_tables || thd->derived_tables) { thd->proc_info="closing tables"; |