database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-10580 sql_mode=ORACLE: FOR loop statement

Browse Source 
Fixed a crash when trying to use a FOR loop as a compound statement
outside of an SP. A bug in 051e415d8a251bd70e9b73619dbcc40f3c65371d.
This commit is contained in:
Alexander Barkov
2016-08-31 08:03:34 +04:00
parent 30bec863cf
commit bf573e21c7
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/compat/oracle/r/sp.result
View File

@ -775,6 +775,18 @@ SELECT @v;
6 6
DROP PROCEDURE p1; DROP PROCEDURE p1;
# Testing the FOR loop statement # Testing the FOR loop statement
CREATE TABLE t1 (a INT);
FOR i IN 1 .. 3
LOOP
INSERT INTO t1 VALUES (i);
END LOOP;
/
SELECT * FROM t1;
a
1
2
3
DROP TABLE t1;
CREATE FUNCTION f1 (lower_bound INT, upper_bound INT, lim INT) RETURN INT CREATE FUNCTION f1 (lower_bound INT, upper_bound INT, lim INT) RETURN INT
AS AS
total INT := 0; total INT := 0;

12
mysql-test/suite/compat/oracle/t/sp.test
View File

@ -847,6 +847,18 @@ DROP PROCEDURE p1;
--echo # Testing the FOR loop statement --echo # Testing the FOR loop statement
CREATE TABLE t1 (a INT);
DELIMITER /;
FOR i IN 1 .. 3
LOOP
INSERT INTO t1 VALUES (i);
END LOOP;
/
DELIMITER ;/
SELECT * FROM t1;
DROP TABLE t1;
DELIMITER /; DELIMITER /;
--error ER_PARSE_ERROR --error ER_PARSE_ERROR
CREATE FUNCTION f1 (lower_bound INT, upper_bound INT, lim INT) RETURN INT CREATE FUNCTION f1 (lower_bound INT, upper_bound INT, lim INT) RETURN INT

2
sql/sql_yacc_ora.yy
View File

@ -3647,6 +3647,8 @@ sp_unlabeled_control:
| FOR_SYM | FOR_SYM
{ {
// See "The FOR LOOP statement" comments in sql_lex.cc // See "The FOR LOOP statement" comments in sql_lex.cc
if (Lex->maybe_start_compound_statement(thd))
MYSQL_YYABORT;
Lex->sp_block_init(thd); // The outer DECLARE..BEGIN..END block Lex->sp_block_init(thd); // The outer DECLARE..BEGIN..END block
} }
sp_for_loop_index_and_bounds sp_for_loop_index_and_bounds