summaryrefslogtreecommitdiff
path: root/sql/sp_rcontext.h
diff options
context:
space:
mode:
authorunknown <pem@mysql.comhem.se>2004-10-23 14:23:32 +0200
committerunknown <pem@mysql.comhem.se>2004-10-23 14:23:32 +0200
commit4c06b4aed7d2df6d7b05de18c646592a2ff3ea94 (patch)
treef4b048b3634a78816e13bcf72711e9dca201ab1a /sql/sp_rcontext.h
parentd925bcd8d61ada4bd61fcbf6ae35b2ee2b1def93 (diff)
downloadmariadb-git-4c06b4aed7d2df6d7b05de18c646592a2ff3ea94.tar.gz
Fixed BUG#6029: Stored procedure specific handlers should have priority.
mysql-test/r/sp.result: New test case for BUG#6022. mysql-test/t/sp.test: New test case for BUG#6022. sql/sp_rcontext.cc: Find the most specific condition handler, not just the first one. (And corrected the return type for find_handler) sql/sp_rcontext.h: Corrected return type for find_handler.
Diffstat (limited to 'sql/sp_rcontext.h')
-rw-r--r--sql/sp_rcontext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index fff10ff3d0a..8e818ab76d1 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -122,7 +122,7 @@ class sp_rcontext : public Sql_alloc
}
// Returns 1 if a handler was found, 0 otherwise.
- int
+ bool
find_handler(uint sql_errno,MYSQL_ERROR::enum_warning_level level);
// Returns handler type and sets *ip to location if one was found