mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
871f36357e
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.
112 lines
2.5 KiB
Text
112 lines
2.5 KiB
Text
#
|
|
# 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
|
|
DROP SCHEMA testdb;
|
|
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;
|
|
#
|
|
# 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;
|
|
#
|
|
# 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;
|
|
End of 5.1 tests
|