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

Merge 10.6 into 10.11

This commit is contained in:
Marko Mäkelä
2024-10-03 10:55:08 +03:00
519 changed files with 5110 additions and 993 deletions

View File

@ -65,7 +65,10 @@ set @test_int=null,@test_double=null,@test_string=null,@test_string2=null;
select @test_int,@test_double,@test_string,@test_string2;
select @t1:=(@t2:=1)+@t3:=4,@t1,@t2,@t3;
explain extended select @t1:=(@t2:=1)+@t3:=4,@t1,@t2,@t3;
#Enable after fix MDEV-31495
--disable_cursor_protocol
select @t5;
--enable_cursor_protocol
#
# Test problem with WHERE and variables
@ -372,7 +375,9 @@ select @@key_buffer_size;
select * from t1 where a=2;
select * from t2 where a=3;
check table t1,t2;
--disable_cursor_protocol
select max(a) +1, max(a) +2 into @xx,@yy from t1;
--enable_cursor_protocol
drop table t1,t2;
#
@ -595,7 +600,9 @@ set global sql_mode=repeat('a',80);
#
create table t1 (a int);
--disable_cursor_protocol
select a into @x from t1;
--enable_cursor_protocol
show warnings;
drop table t1;
@ -1130,7 +1137,9 @@ SET @@global.thread_stack= 7;
# Bug #40657 - assertion with out of range variables and traditional sql_mode
#
--disable_cursor_protocol
SELECT @@global.expire_logs_days INTO @old_eld;
--enable_cursor_protocol
SET GLOBAL expire_logs_days = -1;
--echo needs to've been adjusted (0)
@ -1166,10 +1175,12 @@ SET GLOBAL auto_increment_offset=0;
#
# Bug#41030 Wrong meta data (incorrect fieldlen)
#
#Check after fix MDEV-31540
--disable_cursor_protocol
--enable_metadata
select @@default_storage_engine;
--disable_metadata
--enable_cursor_protocol
#
# Bug#36540: CREATE EVENT and ALTER EVENT statements fail with large server_id