1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '11.3' into 11.4

This commit is contained in:
Oleksandr Byelkin
2024-02-15 13:53:21 +01:00
400 changed files with 10554 additions and 2525 deletions

View File

@@ -5,6 +5,8 @@ if (`SELECT $PS_PROTOCOL != 0`)
--source include/have_innodb.inc
--source include/default_optimizer_switch.inc
--let $replace_regex_tsltz6= /TIMESTAMP..WITH LOCAL TIME ZONE..'....-..-.. ..:..:..[.]......'/TIMESTAMP\/*WITH LOCAL TIME ZONE*\/'YYYY-MM-DD hh:ss:mm:.uuuuuu'/
SET @saved_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = OFF;
@@ -42,6 +44,7 @@ select row_start into @ts_1 from emp where name="jane";
update emp set mgr=30 where name ="john";
--replace_regex $replace_regex_tsltz6
explain extended
with ancestors as (
select e.emp_id, e.name, e.mgr, e.salary from emp as e where name = 'bill'
@@ -68,6 +71,7 @@ as
)
select * from ancestors;
--replace_regex $replace_regex_tsltz6
eval explain extended $q;
eval $q;
@@ -86,6 +90,7 @@ as
)
select * from ancestors for system_time as of timestamp @ts_1;
--replace_regex $replace_regex_tsltz6
eval explain extended $q;
eval $q;
@@ -104,6 +109,7 @@ as
)
select name from emp where emp_id in (select emp_id from ancestors for system_time as of timestamp @ts_1);
--replace_regex $replace_regex_tsltz6
eval explain extended $q;
eval $q;

View File

@@ -1,5 +1,7 @@
--source include/default_optimizer_switch.inc
--let $replace_regex_tsltz6= /TIMESTAMP..WITH LOCAL TIME ZONE..'....-..-.. ..:..:..[.]......'/TIMESTAMP\/*WITH LOCAL TIME ZONE*\/'YYYY-MM-DD hh:ss:mm:.uuuuuu'/
create table emp
(
emp_id int,
@@ -164,6 +166,7 @@ select * from (
select t1.x, t1.y as y1, t2.x as x2, t2.y as y2
from t1 join t2 on t1.x = t2.x) for system_time as of now() as t;
--replace_regex $replace_regex_tsltz6
let $a=`show warnings`;
--echo Query A:
echo $a;
@@ -174,6 +177,7 @@ select * from (
from t1 for system_time as of now()
join t2 for system_time as of now() on t1.x = t2.x) as t;
--replace_regex $replace_regex_tsltz6
let $b=`show warnings`;
--echo Query B:
echo $b;

View File

@@ -6,6 +6,8 @@ if (`SELECT $PS_PROTOCOL != 0`)
--source suite/versioning/common.inc
--source include/default_optimizer_switch.inc
--let $replace_regex_tsltz6= /TIMESTAMP..WITH LOCAL TIME ZONE..'....-..-.. ..:..:..[.]......'/TIMESTAMP\/*WITH LOCAL TIME ZONE*\/'YYYY-MM-DD hh:ss:mm:.uuuuuu'/
SET @saved_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = OFF;
@@ -98,11 +100,14 @@ delete from t1;
delete from t2;
#384
--replace_regex $replace_regex_tsltz6
explain extended select * from (select t1.x as IJ2_x1, t1.y as y1, t2.x as x2, t2.y as y2 from t1 inner join t2 on t1.x = t2.x)
for system_time as of timestamp @t0 as t;
--replace_regex $replace_regex_tsltz6
explain extended select * from (select t1.x as LJ2_x1, t1.y as y1, t2.x as x2, t2.y as y2 from t1 left join t2 on t1.x = t2.x)
for system_time as of timestamp @t0 as t;
#383
--replace_regex $replace_regex_tsltz6
explain extended select * from (select t1.x as RJ2_x1, t1.y as y1, t2.x as x2, t2.y as y2 from t1 right join t2 on t1.x = t2.x)
for system_time as of timestamp @t0 as t;