diff options
| author | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-07-19 23:13:18 +0700 |
|---|---|---|
| committer | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-07-19 23:13:18 +0700 |
| commit | 832e473d5ea62c72e39fae3b6bc691994ff6a5fb (patch) | |
| tree | c55d33eca143dbb9e9c5ebec42df3375a5fd2b84 | |
| parent | fa45400d77b07530da87e5a5cd92992b886a2f88 (diff) | |
| download | mariadb-git-832e473d5ea62c72e39fae3b6bc691994ff6a5fb.tar.gz | |
MDEV-26181: The test compat/oracle.sp-row fails in case it is run in PS mode.
There were several places where a statement delimiter missed so
such statements were interpreted as multi-statements and expectedly failed
in PS mode. An appropriate statement delimiters have been added
to fix the issues. Addinitinally, the operators
--enable_prepare_warnings/--disable_prepare_warnings have been added
around statements that use depricated syntax SELECT INTO to don't
miss warnings.
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/sp-row.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/compat/oracle/t/sp-row.test | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mysql-test/suite/compat/oracle/r/sp-row.result b/mysql-test/suite/compat/oracle/r/sp-row.result index cecc737c9fb..7fd986a71c8 100644 --- a/mysql-test/suite/compat/oracle/r/sp-row.result +++ b/mysql-test/suite/compat/oracle/r/sp-row.result @@ -252,6 +252,7 @@ AS BEGIN RETURN a; END; +$$ CREATE PROCEDURE p1() AS a ROW (a INT,b INT); @@ -268,6 +269,7 @@ AS BEGIN RETURN a; END; +$$ CREATE PROCEDURE p1() AS a ROW (a INT); diff --git a/mysql-test/suite/compat/oracle/t/sp-row.test b/mysql-test/suite/compat/oracle/t/sp-row.test index e2725e3a769..ebd0a2a2137 100644 --- a/mysql-test/suite/compat/oracle/t/sp-row.test +++ b/mysql-test/suite/compat/oracle/t/sp-row.test @@ -1,7 +1,3 @@ -if (`SELECT $PS_PROTOCOL != 0`) -{ - --skip Test temporarily disabled for ps-protocol -} SET sql_mode=ORACLE; @@ -329,6 +325,7 @@ AS BEGIN RETURN a; END; +$$ CREATE PROCEDURE p1() AS a ROW (a INT,b INT); @@ -349,6 +346,7 @@ AS BEGIN RETURN a; END; +$$ CREATE PROCEDURE p1() AS a ROW (a INT); @@ -866,6 +864,8 @@ DROP PROCEDURE p2; --echo # ROW fields as SELECT..INTO targets --echo # +--enable_prepare_warnings + DELIMITER $$; CREATE PROCEDURE p1 AS @@ -879,6 +879,7 @@ DELIMITER ;$$ CALL p1; DROP PROCEDURE p1; +--disable_prepare_warnings --echo # --echo # Implicit default NULL handling @@ -2088,6 +2089,7 @@ DROP PROCEDURE p1; --echo # +--enable_prepare_warnings --echo # ROW variable with a wrong column count CREATE TABLE t1 (a INT, b VARCHAR(32)); INSERT INTO t1 VALUES (10,'b10'); @@ -2248,7 +2250,7 @@ DELIMITER ;$$ CALL p1(); DROP TABLE t1; DROP PROCEDURE p1; - +--disable_prepare_warnings --echo # --echo # MDEV-12347 Valgrind reports invalid read errors in Item_field_row::element_index_by_name |