diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
| commit | 22d455612b0abbb4b9f527e61348d4c6336b59d5 (patch) | |
| tree | d39436232e232c5a5beb996e86e2b34b05ab5115 /mysql-test/suite/compat/oracle | |
| parent | bfdc4ff22ecf626eb46479e1a0dc1049d61a8d78 (diff) | |
| parent | 75d631f333544de4487a6dd251d6f361e1d55d6b (diff) | |
| download | mariadb-git-22d455612b0abbb4b9f527e61348d4c6336b59d5.tar.gz | |
Merge branch '10.8' into 10.9
Diffstat (limited to 'mysql-test/suite/compat/oracle')
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/sp-row.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/compat/oracle/t/sp-row.test | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/suite/compat/oracle/r/sp-row.result b/mysql-test/suite/compat/oracle/r/sp-row.result index a15fe30d8af..7fd986a71c8 100644 --- a/mysql-test/suite/compat/oracle/r/sp-row.result +++ b/mysql-test/suite/compat/oracle/r/sp-row.result @@ -24,7 +24,7 @@ RETURN a; END; $$ SELECT f1(ROW(10,20)); -ERROR HY000: Illegal parameter data types int and row for operation 'SET' +ERROR 21000: Operand should contain 1 column(s) DROP FUNCTION f1; # # ROW as an SP parameter @@ -261,7 +261,7 @@ SELECT f1(a); END; $$ CALL p1(); -ERROR HY000: Illegal parameter data types int and row for operation 'SET' +ERROR 21000: Operand should contain 1 column(s) DROP PROCEDURE p1; DROP FUNCTION f1; CREATE FUNCTION f1(a INT) RETURN INT @@ -278,7 +278,7 @@ SELECT f1(a); END; $$ CALL p1(); -ERROR HY000: Illegal parameter data types int and row for operation 'SET' +ERROR 21000: Operand should contain 1 column(s) DROP PROCEDURE p1; DROP FUNCTION f1; # @@ -332,7 +332,7 @@ RETURN rec; END; $$ SELECT f1(10); -ERROR HY000: Illegal parameter data types int and row for operation 'SET' +ERROR 21000: Operand should contain 1 column(s) DROP FUNCTION f1; # # Using the entire ROW in SELECT..CREATE diff --git a/mysql-test/suite/compat/oracle/t/sp-row.test b/mysql-test/suite/compat/oracle/t/sp-row.test index c7658c76838..ebd0a2a2137 100644 --- a/mysql-test/suite/compat/oracle/t/sp-row.test +++ b/mysql-test/suite/compat/oracle/t/sp-row.test @@ -35,7 +35,7 @@ BEGIN END; $$ DELIMITER ;$$ ---error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION +--error ER_OPERAND_COLUMNS SELECT f1(ROW(10,20)); DROP FUNCTION f1; @@ -334,7 +334,7 @@ BEGIN END; $$ DELIMITER ;$$ ---error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION +--error ER_OPERAND_COLUMNS CALL p1(); DROP PROCEDURE p1; DROP FUNCTION f1; @@ -355,7 +355,7 @@ BEGIN END; $$ DELIMITER ;$$ ---error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION +--error ER_OPERAND_COLUMNS CALL p1(); DROP PROCEDURE p1; DROP FUNCTION f1; @@ -427,7 +427,7 @@ BEGIN END; $$ DELIMITER ;$$ ---error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION +--error ER_OPERAND_COLUMNS SELECT f1(10); DROP FUNCTION f1; |