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 branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-05-05 10:50:02 +02:00
parent ba0433dc1c 2594da7a33
commit b735ca4773
3 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/main/derived_split_innodb.result
View File

@ -801,4 +801,20 @@ a b a b a b grp_id count(*)
5 5 5 2 5 3 5 100 5 5 5 2 5 3 5 100
drop table t1,t2,t3; drop table t1,t2,t3;
drop table t10, t11; drop table t10, t11;
#
# MDEV-31194: Server crash or assertion failure with join_cache_level=4
# (a followup to the above bug, MDEV-26301)
#
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (3),(4);
CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=Aria;
INSERT INTO t2 VALUES (1),(2);
set @tmp1= @@optimizer_switch, @tmp2= @@join_cache_level;
set
optimizer_switch= 'derived_with_keys=off',
join_cache_level= 4;
SELECT t1.* FROM t1 JOIN (SELECT id, COUNT(*) FROM t2 GROUP BY id) sq ON sq.id= t1.a;
a
set optimizer_switch= @tmp1, join_cache_level= @tmp2;
DROP TABLE t1, t2;
# End of 10.4 tests # End of 10.4 tests

23
mysql-test/main/derived_split_innodb.test
View File

@ -441,4 +441,27 @@ eval $q;
drop table t1,t2,t3; drop table t1,t2,t3;
drop table t10, t11; drop table t10, t11;
--echo #
--echo # MDEV-31194: Server crash or assertion failure with join_cache_level=4
--echo # (a followup to the above bug, MDEV-26301)
--echo #
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (3),(4);
CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=Aria;
INSERT INTO t2 VALUES (1),(2);
set @tmp1= @@optimizer_switch, @tmp2= @@join_cache_level;
set
optimizer_switch= 'derived_with_keys=off',
join_cache_level= 4;
SELECT t1.* FROM t1 JOIN (SELECT id, COUNT(*) FROM t2 GROUP BY id) sq ON sq.id= t1.a;
set optimizer_switch= @tmp1, join_cache_level= @tmp2;
# Cleanup
DROP TABLE t1, t2;
--echo # End of 10.4 tests --echo # End of 10.4 tests

2
sql/sql_select.cc
View File

@ -12988,7 +12988,7 @@ uint check_join_cache_usage(JOIN_TAB *tab,
join->return_tab= 0; join->return_tab= 0;
if (tab->no_forced_join_cache) if (tab->no_forced_join_cache)
return 0; goto no_join_cache;
/* /*
Don't use join cache if @@join_cache_level==0 or this table is the first Don't use join cache if @@join_cache_level==0 or this table is the first