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

12
mysql-test/main/select.test
View File

@ -1846,10 +1846,15 @@ select wss_type from t1 where wss_type ='102935229216544104';
select wss_type from t1 where wss_type ='102935229216544093';
select wss_type from t1 where wss_type =102935229216544093;
drop table t1;
--disable_cursor_protocol
select 1+2,"aaaa",3.13*2.0 into @a,@b,@c;
--enable_cursor_protocol
select @a;
select @b;
#Enable after fix MDEV-31495
--disable_cursor_protocol
select @c;
--enable_cursor_protocol
#
# Test of removing redundant braces in the FROM part
@ -2199,7 +2204,10 @@ INSERT INTO t1
(SELECT * FROM t1 WHERE a = 50 AND b = 3);
select found_rows();
SELECT * FROM t1;
# Check after fix MDEV-31522
--disable_cursor_protocol
select count(*) from t1;
--enable_cursor_protocol
select found_rows();
select count(*) from t1 limit 2,3;
select found_rows();
@ -3733,6 +3741,7 @@ DROP TABLE t1;
#
# Bug #32942 now() - interval '7200' second is NOT pre-calculated, causing "full table scan"
#
--disable_cursor_protocol
--disable_ps2_protocol
--disable_view_protocol
CREATE TABLE t1 (a INT, b INT);
@ -3750,6 +3759,7 @@ SHOW STATUS LIKE 'Handler_read%';
DROP TABLE t1, t2;
--enable_view_protocol
--enable_ps2_protocol
--enable_cursor_protocol
#
# Bug#40953 SELECT query throws "ERROR 1062 (23000): Duplicate entry..." error
@ -3826,10 +3836,12 @@ CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES (2),(3);
--echo # Should not crash
--disable_cursor_protocol
--error ER_SUBQUERY_NO_1_ROW
SELECT 1 FROM t1 WHERE a <> 1 AND NOT
ROW(1,a) <=> ROW(1,(SELECT 1 FROM t1))
INTO @var0;
--enable_cursor_protocol
DROP TABLE t1;