database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge from mysql-5.1-security to mysql-5.5-security

Browse Source 
Text conflict in sql/sql_yacc.yy
This commit is contained in:
Jon Olav Hauglid
2012-01-09 11:33:26 +01:00
parent 86701392fc 6c1bbb50cb
commit 63a0c3078b
5 changed files with 89 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/r/sp.result
View File

@@ -7745,3 +7745,26 @@ DROP PROCEDURE p1;
DROP PROCEDURE p2;
DROP TABLE t1;
# End of 5.5 test
#
# Bug#12663165 SP DEAD CODE REMOVAL DOESN'T UNDERSTAND CONTINUE HANDLERS
#
DROP FUNCTION IF EXISTS f1;
CREATE FUNCTION f1() RETURNS INT
BEGIN
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
BEGIN
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f1();
BEGIN
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f1();
RETURN f1();
END;
END;
RETURN 1;
END $
SELECT f1();
f1()
1
Warnings:
Error 1424 Recursive stored functions and triggers are not allowed.
Error 1305 FUNCTION test.f1 does not exist
DROP FUNCTION f1;

29
mysql-test/t/sp.test
View File

@@ -9036,3 +9036,32 @@ DROP PROCEDURE p2;
DROP TABLE t1;
--echo # End of 5.5 test
--echo #
--echo # Bug#12663165 SP DEAD CODE REMOVAL DOESN'T UNDERSTAND CONTINUE HANDLERS
--echo #
--disable_warnings
DROP FUNCTION IF EXISTS f1;
--enable_warnings
delimiter $;
CREATE FUNCTION f1() RETURNS INT
BEGIN
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
BEGIN
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f1();
BEGIN
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f1();
RETURN f1();
END;
END;
RETURN 1;
END $
delimiter ;$
# This used to cause an assertion.
SELECT f1();
DROP FUNCTION f1;