2009-10-26 10:55:57 +01:00
|
|
|
#
|
|
|
|
# Bug #47412: Valgrind warnings / user can read uninitalized memory
|
|
|
|
# using SP variables
|
|
|
|
#
|
|
|
|
CREATE SCHEMA testdb;
|
|
|
|
USE testdb;
|
|
|
|
CREATE FUNCTION f2 () RETURNS INTEGER
|
|
|
|
BEGIN
|
|
|
|
DECLARE CONTINUE HANDLER FOR SQLSTATE '42000' SET @aux = 1;
|
|
|
|
RETURN f_not_exists () ;
|
|
|
|
END|
|
|
|
|
CREATE PROCEDURE p3 ( arg1 VARCHAR(32) )
|
|
|
|
BEGIN
|
|
|
|
CALL p_not_exists ( );
|
|
|
|
END|
|
|
|
|
# should not return valgrind warnings
|
|
|
|
CALL p3 ( f2 () );
|
|
|
|
ERROR 42000: PROCEDURE testdb.p_not_exists does not exist
|
|
|
|
DROP SCHEMA testdb;
|
|
|
|
CREATE SCHEMA testdb;
|
|
|
|
USE testdb;
|
|
|
|
CREATE FUNCTION f2 () RETURNS INTEGER
|
|
|
|
BEGIN
|
|
|
|
DECLARE CONTINUE HANDLER FOR SQLSTATE '42000' SET @aux = 1;
|
|
|
|
RETURN f_not_exists () ;
|
|
|
|
END|
|
|
|
|
CREATE PROCEDURE p3 ( arg2 INTEGER )
|
|
|
|
BEGIN
|
|
|
|
CALL p_not_exists ( );
|
|
|
|
END|
|
|
|
|
# should not return valgrind warnings
|
|
|
|
CALL p3 ( f2 () );
|
|
|
|
ERROR 42000: PROCEDURE testdb.p_not_exists does not exist
|
|
|
|
DROP SCHEMA testdb;
|
|
|
|
CREATE SCHEMA testdb;
|
|
|
|
USE testdb;
|
|
|
|
CREATE FUNCTION f2 () RETURNS INTEGER
|
|
|
|
BEGIN
|
|
|
|
DECLARE CONTINUE HANDLER FOR SQLSTATE '42000' SET @aux = 1;
|
|
|
|
RETURN f_not_exists () ;
|
|
|
|
END|
|
|
|
|
# should not return valgrind warnings
|
|
|
|
SELECT f2 ();
|
|
|
|
f2 ()
|
|
|
|
NULL
|
Auto-merge from mysql-trunk-bugfixing.
******
This patch fixes the following bugs:
- Bug#5889: Exit handler for a warning doesn't hide the warning in
trigger
- Bug#9857: Stored procedures: handler for sqlwarning ignored
- Bug#23032: Handlers declared in a SP do not handle warnings generated
in sub-SP
- Bug#36185: Incorrect precedence for warning and exception handlers
The problem was in the way warnings/errors during stored routine execution
were handled. Prior to this patch the logic was as follows:
- when a warning/an error happens: if we're executing a stored routine,
and there is a handler for that warning/error, remember the handler,
ignore the warning/error and continue execution.
- after a stored routine instruction is executed: check for a remembered
handler and activate one (if any).
This logic caused several problems:
- if one instruction generates several warnings (errors) it's impossible
to choose the right handler -- a handler for the first generated
condition was chosen and remembered for activation.
- mess with handling conditions in scopes different from the current one.
- not putting generated warnings/errors into Warning Info (Diagnostic
Area) is against The Standard.
The patch changes the logic as follows:
- Diagnostic Area is cleared on the beginning of each statement that
either is able to generate warnings, or is able to work with tables.
- at the end of a stored routine instruction, Diagnostic Area is left
intact.
- Diagnostic Area is checked after each stored routine instruction. If
an instruction generates several condition, it's now possible to take a
look at all of them and determine an appropriate handler.
mysql-test/r/signal.result:
Update result file:
1. handled conditions are not cleared any more;
2. reflect changes in signal.test
mysql-test/r/signal_demo3.result:
Update result file: handled conditions are not cleared any more.
Due to playing with max_error_count, resulting warning lists
have changed.
mysql-test/r/sp-big.result:
Update result file: handled conditions are not cleared any more.
mysql-test/r/sp-bugs.result:
Update result file: handled conditions are not cleared any more.
mysql-test/r/sp-code.result:
Update result file:
1. handled conditions are not cleared any more.
2. add result for a new test case in sp-code.test.
mysql-test/r/sp-error.result:
Update result file:
1. handled conditions are not cleared any more.
2. add result for a new test case in sp-error.test.
mysql-test/r/sp.result:
Update result file: handled conditions are not cleared any more.
mysql-test/r/sp_trans.result:
Update result file: handled conditions are not cleared any more.
mysql-test/r/strict.result:
Update result file: handled conditions are not cleared any more.
mysql-test/r/view.result:
Update result file: handled conditions are not cleared any more.
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Update result file: handled conditions are not cleared any more.
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Update result file: handled conditions are not cleared any more.
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Update result file: handled conditions are not cleared any more.
mysql-test/suite/funcs_1/r/storedproc.result:
Update result file: handled conditions are not cleared any more.
mysql-test/suite/rpl/r/rpl_row_sp005.result:
Update result file: handled conditions are not cleared any more.
mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result:
Update result file: handled conditions are not cleared any more.
mysql-test/suite/rpl/r/rpl_row_trig003.result:
Update result file: handled conditions are not cleared any more.
mysql-test/t/signal.test:
Make a test case more readable in the result file.
mysql-test/t/sp-code.test:
Add a test case for Bug#23032 checking that
No Data takes precedence on Warning.
mysql-test/t/sp-error.test:
Adding test cases for:
- Bug#23032
- Bug#36185
- Bug#5889
- Bug#9857
mysql-test/t/sp.test:
Fixing test case to reflect behavioral changes made by the patch.
sql/sp_head.cc:
Reset the per-statement warning count before executing
a stored procedure instruction.
Move to a separate function code which checks the
completion status of the executed statement and searches
for a handler.
Remove redundant code now that search for a handler is
done after execution, errors are always pushed.
sql/sp_pcontext.h:
Remove unused code.
sql/sp_rcontext.cc:
- Polish sp_rcontext::find_handler(): use sp_rcontext::m_hfound instead
of an extra local variable;
- Remove sp_rcontext::handle_condition();
- Introduce sp_rcontext::activate_handler(), which prepares
previously found handler for execution.
- Move sp_rcontext::enter_handler() code into activate_handler(),
because enter_handler() is used only from there;
- Cleanups;
- Introduce DBUG_EXECUTE_IF() for a test case in sp-code.test
sql/sp_rcontext.h:
- Remove unused code
- Cleanups
sql/sql_class.cc:
Merge THD::raise_condition_no_handler() into THD::raise_condition().
After the patch raise_condition_no_handler() was called
in raise_condition() only.
sql/sql_class.h:
Remove raise_condition_no_handler().
sql/sql_error.cc:
Remove Warning_info::reserve_space() -- handled conditions are not
cleared any more, so there is no need for RESIGNAL to re-push them.
sql/sql_error.h:
Remove Warning_info::reserve_space().
sql/sql_signal.cc:
Handled conditions are not cleared any more,
so there is no need for RESIGNAL to re-push them.
2010-07-30 17:28:36 +02:00
|
|
|
Warnings:
|
|
|
|
Error 1305 FUNCTION testdb.f_not_exists does not exist
|
2009-10-26 10:55:57 +01:00
|
|
|
DROP SCHEMA testdb;
|
2010-01-28 15:41:14 +01:00
|
|
|
USE test;
|
|
|
|
#
|
|
|
|
# Bug#50423: Crash on second call of a procedure dropping a trigger
|
|
|
|
#
|
|
|
|
DROP TABLE IF EXISTS t1;
|
|
|
|
DROP TRIGGER IF EXISTS tr1;
|
|
|
|
DROP PROCEDURE IF EXISTS p1;
|
|
|
|
CREATE TABLE t1 (f1 INTEGER);
|
|
|
|
CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET @aux = 1;
|
|
|
|
CREATE PROCEDURE p1 () DROP TRIGGER tr1;
|
|
|
|
CALL p1 ();
|
|
|
|
CALL p1 ();
|
|
|
|
ERROR HY000: Trigger does not exist
|
|
|
|
DROP TABLE t1;
|
|
|
|
DROP PROCEDURE p1;
|
2010-02-13 11:35:14 +01:00
|
|
|
#
|
|
|
|
# Bug#50423: Crash on second call of a procedure dropping a trigger
|
|
|
|
#
|
|
|
|
DROP TABLE IF EXISTS t1;
|
|
|
|
DROP TRIGGER IF EXISTS tr1;
|
|
|
|
DROP PROCEDURE IF EXISTS p1;
|
|
|
|
CREATE TABLE t1 (f1 INTEGER);
|
|
|
|
CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET @aux = 1;
|
|
|
|
CREATE PROCEDURE p1 () DROP TRIGGER tr1;
|
|
|
|
CALL p1 ();
|
|
|
|
CALL p1 ();
|
|
|
|
ERROR HY000: Trigger does not exist
|
|
|
|
DROP TABLE t1;
|
|
|
|
DROP PROCEDURE p1;
|
Fixed bug#54375 - Error in stored procedure leaves connection
in different default schema.
In strict mode, when data truncation or conversion happens,
THD::killed is set to THD::KILL_BAD_DATA.
This is abuse of KILL mechanism to guarantee that execution
of statement is aborted.
The stored procedures execution, on the other hand,
upon detection that a connection was killed, would
terminate immediately, without trying to restore the caller's
context, in particular, restore the caller's current schema.
The fix is, when terminating a stored procedure execution,
to only bypass cleanup if the entire connection was killed,
not in case of other forms of KILL.
mysql-test/r/sp-bugs.result:
Added result for a test case for bug#54375.
mysql-test/t/sp-bugs.test:
Added test case for bug#54375.
sql/sp_head.cc:
sp_head::execute modified: restore saved current db if
connection is not killed.
2010-11-11 05:52:51 +01:00
|
|
|
#
|
|
|
|
# Bug#54375: Error in stored procedure leaves connection
|
|
|
|
# in different default schema
|
|
|
|
#
|
|
|
|
SET @@SQL_MODE = 'STRICT_ALL_TABLES';
|
|
|
|
DROP DATABASE IF EXISTS db1;
|
|
|
|
CREATE DATABASE db1;
|
|
|
|
USE db1;
|
|
|
|
DROP TABLE IF EXISTS t1;
|
|
|
|
CREATE TABLE t1 (c1 int NOT NULL PRIMARY KEY);
|
|
|
|
INSERT INTO t1 VALUES (1);
|
|
|
|
CREATE FUNCTION f1 (
|
|
|
|
some_value int
|
|
|
|
)
|
|
|
|
RETURNS smallint
|
|
|
|
DETERMINISTIC
|
|
|
|
BEGIN
|
|
|
|
INSERT INTO t1 SET c1 = some_value;
|
|
|
|
RETURN(LAST_INSERT_ID());
|
|
|
|
END$$
|
|
|
|
DROP DATABASE IF EXISTS db2;
|
|
|
|
CREATE DATABASE db2;
|
|
|
|
USE db2;
|
|
|
|
SELECT DATABASE();
|
|
|
|
DATABASE()
|
|
|
|
db2
|
|
|
|
SELECT db1.f1(1);
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
SELECT DATABASE();
|
|
|
|
DATABASE()
|
|
|
|
db2
|
|
|
|
USE test;
|
|
|
|
DROP FUNCTION db1.f1;
|
|
|
|
DROP TABLE db1.t1;
|
|
|
|
DROP DATABASE db1;
|
|
|
|
DROP DATABASE db2;
|
2009-10-26 10:55:57 +01:00
|
|
|
End of 5.1 tests
|