1 files changed, 169 insertions, 0 deletions
diff --git a/mysql-test/t/sp-code.test b/mysql-test/t/sp-code.test
index 29b6764ebc6..1f2f5191f0a 100644
--- a/mysql-test/t/sp-code.test
+++ b/mysql-test/t/sp-code.test
@@ -758,3 +758,172 @@ DELIMITER ;$$
 SHOW PROCEDURE CODE p1;
 DROP PROCEDURE p1;
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-14415 Add Oracle-style FOR loop to sql_mode=DEFAULT
+--echo #
+
+--echo # Integer range FOR loop
+
+DELIMITER $$;
+CREATE PROCEDURE p1()
+BEGIN
+  FOR i IN 1..3
+  DO
+    SELECT i;
+  END FOR;
+END;
+$$
+DELIMITER ;$$
+CALL p1;
+SHOW PROCEDURE CODE p1;
+DROP PROCEDURE p1;
+
+
+--echo # Nested integer range FOR loops
+
+DELIMITER $$;
+CREATE PROCEDURE p1()
+BEGIN
+  fori:
+  FOR i IN 1..3
+  DO
+    forj:
+    FOR j IN 1..3
+    DO
+      IF i = 3 THEN
+        LEAVE fori;
+      END IF;
+      IF j = 3 THEN
+        LEAVE forj;
+      END IF;
+      SELECT i,j;
+    END FOR;
+  END FOR;
+END;
+$$
+DELIMITER ;$$
+CALL p1;
+SHOW PROCEDURE CODE p1;
+DROP PROCEDURE p1;
+
+
+--echo # Explicit cursor FOR loops
+
+DELIMITER $$;
+CREATE PROCEDURE p1()
+BEGIN
+  DECLARE cur0 CURSOR FOR SELECT 10 AS a, 'b0' AS b;
+  DECLARE cur1 CURSOR FOR SELECT 10 AS a, 'b0' AS b;
+  DECLARE cur2 CURSOR FOR SELECT 10 AS a, 'b0' AS b;
+  FOR rec1 IN cur1
+  DO
+    SELECT rec1.a, rec1.b;
+    SET rec1.a= 11;
+    SET rec1.b= 'b1';
+    SELECT rec1.a, rec1.b;
+  END FOR;
+  FOR rec0 IN cur0
+  DO
+    SET rec0.a= 10;
+    SET rec0.b='b0';
+  END FOR;
+  FOR rec2 IN cur2
+  DO
+    SET rec2.a= 10;
+    SET rec2.b='b0';
+  END FOR;
+END;
+$$
+DELIMITER ;$$
+SHOW PROCEDURE CODE p1;
+DROP PROCEDURE p1;
+
+
+--echo # Nested explicit cursor FOR loops
+
+DELIMITER $$;
+CREATE PROCEDURE p1()
+BEGIN
+  DECLARE cur0 CURSOR FOR SELECT 10 AS a, 'b0' AS b;
+  FOR rec0 IN cur0
+  DO
+    BEGIN
+      DECLARE cur1 CURSOR FOR SELECT 11 AS a, 'b1' AS b;
+      SET rec0.a= 11;
+      SET rec0.b= 'b0';
+      FOR rec1 IN cur1
+      DO
+        SET rec1.a= 11;
+        SET rec1.b= 'b1';
+        BEGIN
+          DECLARE cur2 CURSOR FOR SELECT 12 AS a, 'b2' AS b;
+          FOR rec2 IN cur2
+          DO
+            SET rec2.a=12;
+            SET rec2.b='b2';
+          END FOR;
+        END;
+      END FOR;
+    END;
+  END FOR;
+END;
+$$
+DELIMITER ;$$
+SHOW PROCEDURE CODE p1;
+DROP PROCEDURE p1;
+
+
+--echo # Implicit cursor FOR loops
+
+DELIMITER $$;
+CREATE PROCEDURE p1()
+BEGIN
+  FOR rec1 IN (SELECT 11 AS a, 'b1' AS b)
+  DO
+    SELECT rec1.a, rec1.b;
+    SET rec1.a= 11;
+    SET rec1.b= 'b1';
+    SELECT rec1.a, rec1.b;
+  END FOR;
+  FOR rec0 IN (SELECT 10 AS a, 'b0' AS b)
+  DO
+    SET rec0.a= 10;
+    SET rec0.b='b0';
+  END FOR;
+  FOR rec2 IN (SELECT 12 AS a, 'b2' AS b)
+  DO
+    SET rec2.a= 10;
+    SET rec2.b='b0';
+  END FOR;
+END;
+$$
+DELIMITER ;$$
+SHOW PROCEDURE CODE p1;
+DROP PROCEDURE p1;
+
+--echo # Nested implicit cursor FOR loops
+
+DELIMITER $$;
+CREATE PROCEDURE p1()
+BEGIN
+  FOR rec0 IN (SELECT 10 AS a, 'b0' AS b)
+  DO
+    SET rec0.a= 11;
+    SET rec0.b= 'b0';
+    FOR rec1 IN (SELECT 11 AS a, 'b1' AS b)
+    DO
+      SET rec1.a= 11;
+      SET rec1.b= 'b1';
+      FOR rec2 IN (SELECT 12 AS a, 'b2' AS b)
+      DO
+        SET rec2.a=12;
+        SET rec2.b='b2';
+      END FOR;
+    END FOR;
+  END FOR;
+END;
+$$
+DELIMITER ;$$
+SHOW PROCEDURE CODE p1;
+DROP PROCEDURE p1;