Merge bb-10.2-ext into 10.3

1 files changed, 79 insertions, 0 deletions

diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 576512e78a4..733e38351c3 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -9774,6 +9774,85 @@ DELIMITER ;$$
 CALL p1();
 DROP PROCEDURE p1;
 
+--echo #
+--echo # MDEV-14228 MariaDB crashes with function
+--echo #
+
+CREATE TABLE t1 (c VARCHAR(16), KEY(c));
+INSERT INTO t1 VALUES ('foo');
+
+DELIMITER $$;
+CREATE FUNCTION f1() RETURNS VARCHAR(16)
+BEGIN
+  DECLARE v VARCHAR(16);
+  FOR v IN (SELECT DISTINCT c FROM t1)
+  DO
+    IF (v = 'bar') THEN
+      SELECT 1 INTO @a;
+    END IF;
+  END FOR;
+  RETURN 'qux';
+END $$
+DELIMITER  ;$$
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+SELECT f1();
+DROP FUNCTION f1;
+
+DELIMITER $$;
+CREATE FUNCTION f1() RETURNS VARCHAR(16)
+BEGIN
+  DECLARE v ROW TYPE OF t1;
+  IF v = 'bar' THEN
+    RETURN 'eq';
+  END IF;
+  RETURN 'ne';
+END $$
+DELIMITER ;$$
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+SELECT f1();
+DROP FUNCTION f1;
+
+DELIMITER $$;
+CREATE FUNCTION f1() RETURNS VARCHAR(16)
+BEGIN
+  DECLARE v ROW(a INT);
+  IF v = 'bar' THEN
+    RETURN 'eq';
+  END IF;
+  RETURN 'ne';
+END $$
+DELIMITER ;$$
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+SELECT f1();
+DROP FUNCTION f1;
+
+DROP TABLE t1;
+
+
+DELIMITER $$;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+BEGIN NOT ATOMIC
+  DECLARE v ROW(a INT);
+  SELECT v IN ('a','b');
+END $$
+DELIMITER ;$$
+
+DELIMITER $$;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+BEGIN NOT ATOMIC
+DECLARE v ROW(a INT);
+  SELECT 'a' IN (v,'b');
+END $$
+DELIMITER ;$$
+
+DELIMITER $$;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+BEGIN NOT ATOMIC
+  DECLARE v ROW(a INT);
+  SELECT 'a' IN ('b',v);
+END $$
+DELIMITER ;$$
+
 --echo # Test affected rows from an sp
 
 create table t1 (a int);