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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-07-03 13:27:23 +02:00
parent f6fcfc1a6a a4ef05d0d5
commit dcd8a64892
166 changed files with 4418 additions and 4258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mysql-test/main/subselect_innodb.test
View File

@ -33,10 +33,7 @@ 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
SELECT 'c373e9f5ad0791a0dab5444553544200' IN(SELECT t1.FOLDERID FROM t1 WHERE t1.PARENTID='2f6161e879db43c1a5b82c21ddc49089' AND t1.FOLDERNAME = 'Level1') as exp;
drop table t1;
#
@ -73,10 +70,7 @@ 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
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) as result FROM t1 p1;
drop table t2,t1,t3;
#
@ -214,8 +208,6 @@ 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
@ -223,9 +215,8 @@ select
(SELECT lt.t1_id
FROM t1 lt
WHERE lt.t3_id=a.t3_id)
ORDER BY b DESC LIMIT 1)
ORDER BY b DESC LIMIT 1) as exp
from t3 AS a;
--enable_view_protocol
# repeat above query in SP
--disable_warnings
DROP PROCEDURE IF EXISTS p1;
@ -641,8 +632,6 @@ 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
@ -650,8 +639,7 @@ SELECT 1 IN (
a IS NOT NULL
GROUP BY
(SELECT NULL from dual WHERE a = 1)
);
--enable_view_protocol
) as exp;
drop table t1;
--echo # Testcase from MDEV-26164
@ -673,10 +661,7 @@ 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
SELECT 1 IN (SELECT a FROM t1 LEFT JOIN t2 ON (a = b AND EXISTS (SELECT * FROM t1))) as exp;
drop table t1,t2;
--echo #