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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mysql-test/main/subselect.test
View File

@ -75,10 +75,13 @@ SELECT ROW(1,2,3) = (SELECT 1,2,3);
SELECT ROW(1,2,3) = (SELECT 1,2,1);
SELECT ROW(1,2,3) < (SELECT 1,2,1);
SELECT ROW(1,2,3) > (SELECT 1,2,1);
#enable after fix MDEV-31728
--disable_cursor_protocol
#enable after fix MDEV-28585
--disable_view_protocol
SELECT ROW(1,2,3) = (SELECT 1,2,NULL);
--enable_view_protocol
--enable_cursor_protocol
SELECT (SELECT 1.5,2,'a') = ROW(1.5,2,'a') AS m;
SELECT (SELECT 1.5,2,'a') = ROW(1.5,2,'b') AS m;
SELECT (SELECT 1.5,2,'a') = ROW('1.5b',2,'b') AS m;
@ -515,8 +518,11 @@ select 1 IN (SELECT * from t1);
select 3 IN (SELECT * from t1);
select 10 IN (SELECT * from t1);
select 1 > ALL (SELECT * from t1);
#enable after fix MDEV-31728
--disable_cursor_protocol
select 10 > ALL (SELECT * from t1);
select 1 > ANY (SELECT * from t1);
--enable_cursor_protocol
select 10 > ANY (SELECT * from t1);
drop table t1;
create table t1 (a varchar(20));
@ -529,8 +535,11 @@ select 'A' IN (SELECT * from t1);
select 'DEF' IN (SELECT * from t1);
select 'XYZS' IN (SELECT * from t1);
select 'A' > ALL (SELECT * from t1);
#enable after fix MDEV-31728
--disable_cursor_protocol
select 'XYZS' > ALL (SELECT * from t1);
select 'A' > ANY (SELECT * from t1);
--enable_cursor_protocol
select 'XYZS' > ANY (SELECT * from t1);
drop table t1;
create table t1 (a float);
@ -543,15 +552,21 @@ select 1.5 IN (SELECT * from t1);
select 3.5 IN (SELECT * from t1);
select 10.5 IN (SELECT * from t1);
select 1.5 > ALL (SELECT * from t1);
#enable after fix MDEV-31728
--disable_cursor_protocol
select 10.5 > ALL (SELECT * from t1);
select 1.5 > ANY (SELECT * from t1);
--enable_cursor_protocol
update t1 set a=NULL where a=2.5;
select 1.5 IN (SELECT * from t1);
select 3.5 IN (SELECT * from t1);
select 10.5 IN (SELECT * from t1);
select 1.5 > ALL (SELECT * from t1);
#enable after fix MDEV-31728
--disable_cursor_protocol
select 10.5 > ALL (SELECT * from t1);
select 1.5 > ANY (SELECT * from t1);
--enable_cursor_protocol
select 10.5 > ANY (SELECT * from t1);
--enable_prepare_warnings
--enable_view_protocol
@ -1187,7 +1202,9 @@ let $outfile_rel= ../../tmp/subselect.out.file.1;
--error 0,1
--remove_file $outfile_abs
--enable_warnings
--disable_cursor_protocol
eval select a, (select max(b) from t1) into outfile "$outfile_rel" from t1;
--enable_cursor_protocol
delete from t1;
eval load data infile "$outfile_rel" into table t1;
--remove_file $outfile_abs
@ -3593,7 +3610,9 @@ DROP TABLE t1,t2;
CREATE TABLE t1(a1 int);
INSERT INTO t1 VALUES (1),(2);
--disable_cursor_protocol
SELECT @@session.sql_mode INTO @old_sql_mode;
--enable_cursor_protocol
SET SESSION sql_mode='ONLY_FULL_GROUP_BY';
## First a simpler query, illustrating the transformation
@ -3631,7 +3650,9 @@ INSERT INTO t1 VALUES (1),(2);
CREATE TABLE t2(a1 int);
INSERT INTO t2 VALUES (3);
--disable_cursor_protocol
SELECT @@session.sql_mode INTO @old_sql_mode;
--enable_cursor_protocol
SET SESSION sql_mode='ONLY_FULL_GROUP_BY';
## All these are subject to the transformation
@ -3652,7 +3673,9 @@ DROP TABLE t1, t2;
create table t2(i int);
insert into t2 values(0);
--disable_cursor_protocol
SELECT @@session.sql_mode INTO @old_sql_mode;
--enable_cursor_protocol
SET SESSION sql_mode='ONLY_FULL_GROUP_BY';
CREATE VIEW v1 AS
@ -5028,7 +5051,9 @@ INSERT INTO t1 VALUES (1),(2);
CREATE TABLE t2(a1 int);
INSERT INTO t2 VALUES (3);
--disable_cursor_protocol
SELECT @@session.sql_mode INTO @old_sql_mode;
--enable_cursor_protocol
SET SESSION sql_mode='ONLY_FULL_GROUP_BY';
## All these are subject to the transformation
@ -5045,7 +5070,9 @@ DROP TABLE t1, t2;
create table t2(i int);
insert into t2 values(0);
--disable_cursor_protocol
SELECT @@session.sql_mode INTO @old_sql_mode;
--enable_cursor_protocol
SET SESSION sql_mode='ONLY_FULL_GROUP_BY';
CREATE VIEW v1 AS
@ -5437,8 +5464,10 @@ DROP TABLE t1,t2,t3;
CREATE TABLE t1(a1 int);
INSERT INTO t1 VALUES (1),(2);
--disable_cursor_protocol
SELECT @@session.sql_mode INTO @old_sql_mode;
--enable_cursor_protocol
SET SESSION sql_mode='ONLY_FULL_GROUP_BY';
## First a simpler query, illustrating the transformation
@ -5868,10 +5897,12 @@ FROM t2 alias1, t1 alias2, t1 alias3;
--disable_ps2_protocol
flush status;
--disable_cursor_protocol
SELECT
(SELECT MIN(b) FROM t1, t2
WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m
FROM t2 alias1, t1 alias2, t1 alias3;
--enable_cursor_protocol
show status like "subquery_cache%";
show status like '%Handler_read%';
@ -5886,10 +5917,12 @@ FROM t2 alias1, t1 alias2, t1 alias3;
flush status;
--disable_cursor_protocol
SELECT
(SELECT MIN(b) FROM t1, t2
WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m
FROM t2 alias1, t1 alias2, t1 alias3;
--enable_cursor_protocol
show status like "subquery_cache%";
show status like '%Handler_read%';