1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge branch 'bb-10.3-all-builders' into bb-10.4-all-builders

This commit is contained in:
Lena Startseva
2022-09-23 19:47:13 +07:00
274 changed files with 1896 additions and 175 deletions

View File

@ -30,7 +30,10 @@ CREATE INDEX CMFLDRPARNT_IDX ON t1 (PARENTID);
INSERT INTO t1 VALUES("0c9aab05b15048c59bc35c8461507deb", "System", "System", "2003-06-05 16:30:00", "The system content repository folder.", "3", "2003-06-05 16:30:00", "System", "0", NULL, "9c9aab05b15048c59bc35c8461507deb", "1");
INSERT INTO t1 VALUES("2f6161e879db43c1a5b82c21ddc49089", "Default", "System", "2003-06-09 10:52:02", "The default content repository folder.", "3", "2003-06-05 16:30:00", "System", "0", NULL, "03eea05112b845949f3fd03278b5fe43", "1");
INSERT INTO t1 VALUES("c373e9f5ad0791724315444553544200", "AddDocumentTest", "admin", "2003-06-09 10:51:25", "Movie Reviews", "0", "2003-06-09 10:51:25", "admin", "0", "2f6161e879db43c1a5b82c21ddc49089", "03eea05112b845949f3fd03278b5fe43", NULL);
#enable after fix MDEV-27871
--disable_view_protocol
SELECT 'c373e9f5ad0791a0dab5444553544200' IN(SELECT t1.FOLDERID FROM t1 WHERE t1.PARENTID='2f6161e879db43c1a5b82c21ddc49089' AND t1.FOLDERNAME = 'Level1');
--enable_view_protocol
drop table t1;
#
@ -67,7 +70,10 @@ CREATE TABLE t2 (
INSERT INTO t1 VALUES (1),(2),(3);
INSERT INTO t3 VALUES (1,1),(2,2),(3,3);
INSERT INTO t2 VALUES (1,1),(2,2),(3,3);
#enable after fix MDEV-27871
--disable_view_protocol
SELECT distinct p1.processor_id, (SELECT y.yod_id FROM t1 p2, t2 y WHERE p2.processor_id = p1.processor_id and p2.processor_id = y.processor_id) FROM t1 p1;
--enable_view_protocol
drop table t2,t1,t3;
#
@ -205,6 +211,8 @@ CREATE TABLE `t3` (
`t3_id` int NOT NULL
);
INSERT INTO `t3` VALUES (3);
#enable after fix MDEV-27871
--disable_view_protocol
select
(SELECT rs.t2_id
FROM t2 rs
@ -214,6 +222,7 @@ select
WHERE lt.t3_id=a.t3_id)
ORDER BY b DESC LIMIT 1)
from t3 AS a;
--enable_view_protocol
# repeat above query in SP
--disable_warnings
DROP PROCEDURE IF EXISTS p1;
@ -629,7 +638,8 @@ set character_set_connection=@save_character_set_connection;
--echo # MDEV-26047: MariaDB server crash at Item_subselect::init_expr_cache_tracker
--echo #
CREATE TABLE t1 (a int) engine=innodb;
#enable abter fix MDEV-27871
--disable_view_protocol
SELECT 1 IN (
SELECT NULL
FROM t1
@ -638,6 +648,7 @@ SELECT 1 IN (
GROUP BY
(SELECT NULL from dual WHERE a = 1)
);
--enable_view_protocol
drop table t1;
--echo # Testcase from MDEV-26164
@ -659,9 +670,10 @@ CREATE TABLE t1 (a INT) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1),(2);
CREATE TABLE t2 (b INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (3),(4);
#enable after fix MDEV-27871
--disable_view_protocol
SELECT 1 IN (SELECT a FROM t1 LEFT JOIN t2 ON (a = b AND EXISTS (SELECT * FROM t1)));
--enable_view_protocol
drop table t1,t2;
--echo #