diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-03-15 12:51:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-03-15 12:51:23 +0100 |
| commit | f09ca00e088b316441bb76e97ba097bc9f3da7d3 (patch) | |
| tree | 1a557d74018ed9cd073b5aa960bd62421962e73d /sql/sp_head.cc | |
| parent | 2ceaffc4672c62a772890da7761d11f13d3f5ee4 (diff) | |
| parent | 71b3e46b0160936596195682a731703900fb4fff (diff) | |
| download | mariadb-git-f09ca00e088b316441bb76e97ba097bc9f3da7d3.tar.gz | |
merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 54bdf83e2a0..e042475d295 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1792,6 +1792,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, "Invoked ROUTINE modified a transactional table but MySQL " "failed to reflect this change in the binary log"); + err_status= TRUE; } reset_dynamic(&thd->user_var_events); /* Forget those values, in case more function calls are binlogged: */ @@ -2775,8 +2776,15 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, m_lex->mark_as_requiring_prelocking(NULL); } thd->rollback_item_tree_changes(); - /* Update the state of the active arena. */ - thd->stmt_arena->state= Query_arena::EXECUTED; + /* + Update the state of the active arena if no errors on + open_tables stage. + */ + if (!res || !thd->is_error() || + (thd->main_da.sql_errno() != ER_CANT_REOPEN_TABLE && + thd->main_da.sql_errno() != ER_NO_SUCH_TABLE && + thd->main_da.sql_errno() != ER_UPDATE_TABLE_USED)) + thd->stmt_arena->state= Query_arena::EXECUTED; /* Merge here with the saved parent's values |