diff options
| author | unknown <pem@mysql.com> | 2005-10-17 15:07:47 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-10-17 15:07:47 +0200 |
| commit | 7bcbbde34ddcf7e28876e351cc6be1bf894a4d34 (patch) | |
| tree | d16ca31453be37d53895be07584765b1337a6698 /mysql-test | |
| parent | ea86ef655c07da717c53c7589a1f01fa44ea94ae (diff) | |
| download | mariadb-git-7bcbbde34ddcf7e28876e351cc6be1bf894a4d34.tar.gz | |
Additional fix for BUG#7049, after review.
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
mysql-test/r/sp.result:
Updated test results after fixing error handling in select.
sql/mysqld.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/protocol.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/sp_rcontext.h:
Added method for checking if the handler was found in the current context.
sql/sql_error.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sp.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 1791cd385f4..19d5666dc5a 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -3310,7 +3310,6 @@ select 1| 1 call bug12379_1()| bug12379() -NULL 42 42 select 2| @@ -3318,7 +3317,6 @@ select 2| 2 call bug12379_2()| bug12379() -NULL select 3| 3 3 |