database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-26180: Enable test main.sp-row after the 10.5 merge

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-08-03 11:38:55 +02:00
parent 7ae6ef5236
commit 2db692f5b4
5 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/cte_recursive.test
View File

@ -1,7 +1,3 @@
if (`SELECT $PS_PROTOCOL != 0`)
{
--skip Test temporarily disabled for ps-protocol
}
--source include/default_optimizer_switch.inc --source include/default_optimizer_switch.inc
create table t1 (a int, b varchar(32)); create table t1 (a int, b varchar(32));

5
mysql-test/main/func_group.test
View File

@ -2,11 +2,6 @@
# simple test of all group functions # simple test of all group functions
# #
if (`SELECT $PS_PROTOCOL != 0`)
{
--skip Test temporarily disabled for ps-protocol
}
--disable_warnings --disable_warnings
drop table if exists t1,t2,t3,t4,t5,t6; drop table if exists t1,t2,t3,t4,t5,t6;
--enable_warnings --enable_warnings

1
mysql-test/main/sp-row.result
View File

@ -228,6 +228,7 @@ CREATE FUNCTION f1(a INT) RETURNS INT
BEGIN BEGIN
RETURN a; RETURN a;
END; END;
$$
CREATE PROCEDURE p1() CREATE PROCEDURE p1()
BEGIN BEGIN
DECLARE a ROW (a INT,b INT); DECLARE a ROW (a INT,b INT);

12
mysql-test/main/sp-row.test
View File

@ -2,11 +2,6 @@
--echo # MDEV-10914 ROW data type for stored routine variables --echo # MDEV-10914 ROW data type for stored routine variables
--echo # --echo #
if (`SELECT $PS_PROTOCOL != 0`)
{
--skip Test temporarily disabled for ps-protocol
}
--echo # --echo #
--echo # ROW of ROWs is not supported yet --echo # ROW of ROWs is not supported yet
--echo # --echo #
@ -304,6 +299,7 @@ CREATE FUNCTION f1(a INT) RETURNS INT
BEGIN BEGIN
RETURN a; RETURN a;
END; END;
$$
CREATE PROCEDURE p1() CREATE PROCEDURE p1()
BEGIN BEGIN
DECLARE a ROW (a INT,b INT); DECLARE a ROW (a INT,b INT);
@ -1340,6 +1336,7 @@ DROP PROCEDURE p1;
--echo # ROW variable with a wrong column count --echo # ROW variable with a wrong column count
--enable_prepare_warnings
CREATE TABLE t1 (a INT, b VARCHAR(32)); CREATE TABLE t1 (a INT, b VARCHAR(32));
INSERT INTO t1 VALUES (10,'b10'); INSERT INTO t1 VALUES (10,'b10');
DELIMITER $$; DELIMITER $$;
@ -1351,6 +1348,7 @@ BEGIN
END; END;
$$ $$
DELIMITER ;$$ DELIMITER ;$$
--disable_prepare_warnings
--error ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT --error ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT
CALL p1(); CALL p1();
DROP TABLE t1; DROP TABLE t1;
@ -1360,6 +1358,7 @@ DROP PROCEDURE p1;
--echo # Multiple ROW variables --echo # Multiple ROW variables
CREATE TABLE t1 (a INT, b VARCHAR(32)); CREATE TABLE t1 (a INT, b VARCHAR(32));
INSERT INTO t1 VALUES (10,'b10'); INSERT INTO t1 VALUES (10,'b10');
--enable_prepare_warnings
DELIMITER $$; DELIMITER $$;
CREATE PROCEDURE p1() CREATE PROCEDURE p1()
BEGIN BEGIN
@ -1369,6 +1368,7 @@ BEGIN
END; END;
$$ $$
DELIMITER ;$$ DELIMITER ;$$
--disable_prepare_warnings
--error ER_OPERAND_COLUMNS --error ER_OPERAND_COLUMNS
CALL p1(); CALL p1();
DROP TABLE t1; DROP TABLE t1;
@ -1378,6 +1378,7 @@ DROP PROCEDURE p1;
--echo # ROW variables working example --echo # ROW variables working example
CREATE TABLE t1 (a INT, b VARCHAR(32)); CREATE TABLE t1 (a INT, b VARCHAR(32));
INSERT INTO t1 VALUES (10,'b10'); INSERT INTO t1 VALUES (10,'b10');
--enable_prepare_warnings
DELIMITER $$; DELIMITER $$;
CREATE PROCEDURE p1() CREATE PROCEDURE p1()
BEGIN BEGIN
@ -1387,6 +1388,7 @@ BEGIN
END; END;
$$ $$
DELIMITER ;$$ DELIMITER ;$$
--disable_prepare_warnings
CALL p1(); CALL p1();
DROP TABLE t1; DROP TABLE t1;
DROP PROCEDURE p1; DROP PROCEDURE p1;

5
mysql-test/suite/plugins/t/test_sql_service.test
View File

@ -1,8 +1,3 @@
if (`SELECT $PS_PROTOCOL != 0`)
{
--skip Test temporarily disabled for ps-protocol
}
--source include/not_embedded.inc --source include/not_embedded.inc
if (!$TEST_SQL_SERVICE_SO) { if (!$TEST_SQL_SERVICE_SO) {