diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-22 00:33:11 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-22 00:33:11 +0300 |
| commit | 0afa209018fad0a0863048cebfcc8f0a52b814ee (patch) | |
| tree | 94830ebea81e944773f55fcb501055d762e3db1d /sql/sql_class.cc | |
| parent | 4b85061e09ae3ec67948f9814700f69934138e99 (diff) | |
| parent | 20dfd709d6454f8cdc25262c945ad203cecafc02 (diff) | |
| download | mariadb-git-0afa209018fad0a0863048cebfcc8f0a52b814ee.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d37058d2167..4c604d0b5f7 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -608,10 +608,10 @@ bool THD::handle_condition(uint sql_errno, for (Internal_error_handler *error_handler= m_internal_handler; error_handler; - error_handler= m_internal_handler->m_prev_internal_handler) + error_handler= error_handler->m_prev_internal_handler) { - if (error_handler-> handle_condition(this, sql_errno, sqlstate, level, msg, - cond_hdl)) + if (error_handler->handle_condition(this, sql_errno, sqlstate, level, msg, + cond_hdl)) { return TRUE; } @@ -621,10 +621,12 @@ bool THD::handle_condition(uint sql_errno, } -void THD::pop_internal_handler() +Internal_error_handler *THD::pop_internal_handler() { DBUG_ASSERT(m_internal_handler != NULL); + Internal_error_handler *popped_handler= m_internal_handler; m_internal_handler= m_internal_handler->m_prev_internal_handler; + return popped_handler; } |