summaryrefslogtreecommitdiff
path: root/sql/sp_rcontext.cc
diff options
context:
space:
mode:
authorpem@mysql.comhem.se <>2005-04-08 16:05:16 +0200
committerpem@mysql.comhem.se <>2005-04-08 16:05:16 +0200
commite99da54fd5a808925069b77b10654d004a94074b (patch)
treecb502e9c674470204bd816c7a7a6a8db7aa9a0dc /sql/sp_rcontext.cc
parentb950bc210c64440c9bc12c9d8d77c9cf4a0b5ac4 (diff)
downloadmariadb-git-e99da54fd5a808925069b77b10654d004a94074b.tar.gz
Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions
Diffstat (limited to 'sql/sp_rcontext.cc')
-rw-r--r--sql/sp_rcontext.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index 9b29c173856..e9271146cad 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.cc
@@ -95,8 +95,8 @@ sp_rcontext::find_handler(uint sql_errno,
found= i;
break;
case sp_cond_type_t::exception:
- if ((sqlstate[0] != '0' || sqlstate[1] > '2' ||
- level == MYSQL_ERROR::WARN_LEVEL_ERROR) &&
+ if ((sqlstate[0] != '0' || sqlstate[1] > '2') &&
+ level == MYSQL_ERROR::WARN_LEVEL_ERROR &&
(found < 0 || m_handler[found].cond->type > sp_cond_type_t::state))
found= i;
break;