Merge branch '10.6' into 10.9

mysql-test/suite/compat/oracle/t/sequence.test

@@ -2,6 +2,7 @@
 
 SET sql_mode=ORACLE;
 
+--disable_ps2_protocol
 CREATE SEQUENCE s1;
 SHOW CREATE SEQUENCE s1;
 SELECT s1.currval;
@@ -13,12 +14,14 @@ SELECT nextval(s1);
 EXPLAIN EXTENDED SELECT s1.currval;
 SELECT lastval(s1);
 DROP SEQUENCE s1;
-
+--enable_ps2_protocol
 
 CREATE SEQUENCE s1;
 CREATE VIEW v1 AS SELECT s1.nextval AS a;
 SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME='v1';
+--disable_ps2_protocol
 SELECT * FROM v1;
+--enable_ps2_protocol
 SHOW CREATE VIEW v1;
 DROP VIEW v1;
 DROP SEQUENCE s1;
@@ -35,9 +38,11 @@ DROP SEQUENCE s1;
 --echo #
 --echo # MDEV-12533 sql_mode=ORACLE: Add support for database qualified sequence names in NEXTVAL and CURRVAL
 --echo #
+--disable_ps2_protocol
 CREATE SEQUENCE s1;
 SELECT test.s1.nextval;
 SELECT test.s1.currval;
 SELECT .s1.nextval;
 SELECT .s1.currval;
 DROP SEQUENCE s1;
+--enable_ps2_protocol

mysql-test/suite/compat/oracle/t/sp-inout.test

@@ -1236,7 +1236,9 @@ DELIMITER ;$$
 
 select * from Persons;
 set @a = 6;
+--disable_ps2_protocol
 select pkg2.func_main(@a);
+--enable_ps2_protocol
 select * from Persons;
 DROP TABLE Persons;
 DROP PACKAGE pkg2;
@@ -1374,7 +1376,9 @@ DELIMITER ;$$
 
 select * from Persons;
 set @a = 6;
+--disable_ps2_protocol
 select pkg2.func_main(@a);
+--enable_ps2_protocol
 select * from Persons;
 DROP TABLE Persons;
 DROP PACKAGE pkg2;

mysql-test/suite/compat/oracle/t/sp-memory-leak.test

@@ -0,0 +1,35 @@
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-26186 280 Bytes lost in mysys/array.c, mysys/hash.c, sql/sp.cc, sql/sp.cc, sql/item_create.cc, sql/item_create.cc, sql/sql_yacc.yy:10748 when using oracle sql_mode
+--echo #
+
+SET sql_mode= 'oracle';
+--error ER_SP_LILABEL_MISMATCH
+BEGIN CONTINUE WHEN f0();
+
+SET sql_mode= 'oracle';
+--error ER_SP_LILABEL_MISMATCH
+BEGIN CONTINUE label WHEN f0();
+
+SET sql_mode= 'oracle';
+--error ER_SP_LILABEL_MISMATCH
+BEGIN EXIT WHEN f0();
+
+SET sql_mode= 'oracle';
+--error ER_SP_LILABEL_MISMATCH
+BEGIN EXIT label WHEN f0();
+
+SET sql_mode= 'oracle';
+--error ER_PARSE_ERROR
+--query WHILE f(8)<1 DO SELECT 1;
+
+SET sql_mode= 'oracle';
+--error ER_SP_BADRETURN
+BEGIN DECLARE CONTINUE HANDLER FOR SQLEXCEPTION RETURN f0();
+
+--echo #
+--echo # End of 10.5 tests
+--echo #

mysql-test/suite/compat/oracle/t/sp-package-i_s.test

@@ -0,0 +1,69 @@
+--source include/default_charset.inc
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+
+--echo #
+--echo #  MDEV-30662 SQL/PL package body does not appear in I_S.ROUTINES.ROUTINE_DEFINITION
+--echo #
+
+# Testing a package without the executable section
+
+SET sql_mode=ORACLE;
+DELIMITER $$;
+CREATE OR REPLACE PACKAGE pkg1 AS
+  FUNCTION f1() RETURN INT;
+END;
+$$
+CREATE PACKAGE BODY pkg1 AS
+  FUNCTION f1() RETURN INT AS
+  BEGIN
+    RETURN 1;
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--vertical_results
+SELECT routine_name, routine_type, routine_definition
+FROM information_schema.routines
+WHERE routine_type LIKE 'PACKAGE%'
+ORDER BY routine_type;
+--horizontal_results
+
+DROP PACKAGE pkg1;
+
+# Testing a package with the executable section
+
+SET sql_mode=ORACLE;
+DELIMITER $$;
+CREATE OR REPLACE PACKAGE pkg1 AS
+  FUNCTION f1() RETURN INT;
+END;
+$$
+CREATE PACKAGE BODY pkg1 AS
+  FUNCTION f1() RETURN INT AS
+  BEGIN
+    RETURN 1;
+  END;
+BEGIN
+  SET @a=10;
+  SET @a=f1();
+END;
+$$
+DELIMITER ;$$
+
+--vertical_results
+SELECT routine_name, routine_type, routine_definition
+FROM information_schema.routines
+WHERE routine_type LIKE 'PACKAGE%'
+ORDER BY routine_type;
+--horizontal_results
+
+DROP PACKAGE pkg1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #

mysql-test/suite/compat/oracle/t/sp-package.test

@@ -3,6 +3,7 @@
 SET sql_mode=ORACLE;
 
 --enable_prepare_warnings
+--disable_ps2_protocol
 
 --echo #
 --echo # Creating a body of a non-existing package
@@ -3013,6 +3014,7 @@ DELIMITER ;$$
 
 SELECT db2.pkg1.var1();
 CALL db2.pkg1.p2_db1_pkg1_p1;
+--enable_ps2_protocol
 
 DROP DATABASE db1;
 DROP DATABASE db2;