diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-15 18:32:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-15 18:32:08 +0300 |
| commit | 5f1f2fc0e443f098af24d21f7d1ec1a8166a4030 (patch) | |
| tree | 7b870d0c390c05d6629f4813966e740ea073fcef /sql/sp_rcontext.cc | |
| parent | 3143ad589a24ac7581e2195ba0dc13576cb3c9da (diff) | |
| download | mariadb-git-5f1f2fc0e443f098af24d21f7d1ec1a8166a4030.tar.gz | |
Applied all changes from Igor and Sanja
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index 30acfebabb2..fc6a67fb496 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -204,7 +204,7 @@ bool sp_rcontext::find_handler(THD *thd, uint sql_errno, const char *sqlstate, - MYSQL_ERROR::enum_warning_level level, + Sql_condition::enum_warning_level level, const char *msg) { int i= m_hcount; @@ -248,7 +248,7 @@ sp_rcontext::find_handler(THD *thd, break; case sp_cond_type_t::warning: if ((IS_WARNING_CONDITION(sqlstate) || - level == MYSQL_ERROR::WARN_LEVEL_WARN) && + level == Sql_condition::WARN_LEVEL_WARN) && m_hfound < 0) m_hfound= i; break; @@ -258,7 +258,7 @@ sp_rcontext::find_handler(THD *thd, break; case sp_cond_type_t::exception: if (IS_EXCEPTION_CONDITION(sqlstate) && - level == MYSQL_ERROR::WARN_LEVEL_ERROR && + level == Sql_condition::WARN_LEVEL_ERROR && m_hfound < 0) m_hfound= i; break; @@ -281,7 +281,7 @@ sp_rcontext::find_handler(THD *thd, (warning or "not found") we will simply resume execution. */ if (m_prev_runtime_ctx && IS_EXCEPTION_CONDITION(sqlstate) && - level == MYSQL_ERROR::WARN_LEVEL_ERROR) + level == Sql_condition::WARN_LEVEL_ERROR) { return m_prev_runtime_ctx->find_handler(thd, sql_errno, sqlstate, level, msg); @@ -575,7 +575,7 @@ sp_cursor::fetch(THD *thd, List<struct sp_variable> *vars) } DBUG_EXECUTE_IF("bug23032_emit_warning", - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR));); |