diff options
| author | pem@mysql.comhem.se <> | 2005-02-21 14:57:43 +0100 |
|---|---|---|
| committer | pem@mysql.comhem.se <> | 2005-02-21 14:57:43 +0100 |
| commit | d88fa42cab4700fef3788559f81419512823a1dd (patch) | |
| tree | 1458532afd85867f6ae747892c6f482f4c948cc9 /sql/sp_head.cc | |
| parent | fcb135560dd0a93de69dfddcd37d0c6b121c4260 (diff) | |
| download | mariadb-git-d88fa42cab4700fef3788559f81419512823a1dd.tar.gz | |
A minor adjustment of the previous bug fix in sp_head.cc.
(Which btw also fixed BUG#7295: Server crash when executing stored procedure,
I just forgot to include that before.)
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index f2a8239fd4e..72e2204f1b4 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -504,6 +504,7 @@ sp_head::execute(THD *thd) break; DBUG_PRINT("execute", ("Instruction %u", ip)); ret= i->execute(thd, &ip); + thd->rollback_item_tree_changes(); if (i->free_list) cleanup_items(i->free_list); // Check if an exception has occurred and a handler has been found @@ -1195,7 +1196,6 @@ 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"; |