database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-26135 Assertion failure when executing PS with a hanging recursive CTE

Browse Source 
The bug affected execution of queries with With clauses containing so-called
hanging recursive CTEs in PREPARE mode. A CTE is hanging if it's not used
in the query. Preparation of a prepared statement from a query with a
hanging CTE caused a leak in the server and execution of this prepared
statement led to an assert failure of the server built in the debug mode.
This happened because the units specifying recursive CTEs erroneously were
not cleaned up if those CTEs were hanging.
The patch enforces cleanup of hanging recursive CTEs in the same way as
other hanging CTEs.

Approved by dmitry.shulga@mariadb.com
This commit is contained in:
Igor Babaev
2021-07-16 22:46:50 -07:00
parent b7886f55eb
commit f053349797
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mysql-test/r/cte_recursive.result
View File

@ -4454,5 +4454,32 @@ deallocate prepare stmt;
drop table folks;
set big_tables=@save_big_tables;
#
# MDEV-26135: execution of PS for query with hanging recursive CTE
#
create table t1 (a int);
insert into t1 values (5), (7);
create table t2 (b int);
insert into t2 values (3), (7), (1);
with recursive r as (select a from t1 union select a+1 from r where a < 10)
select * from t2;
b
3
7
1
prepare stmt from "with recursive r as (select a from t1 union select a+1 from r where a < 10)
select * from t2";
execute stmt;
b
3
7
1
execute stmt;
b
3
7
1
deallocate prepare stmt;
drop table t1,t2;
#
# End of 10.2 tests
#

21
mysql-test/t/cte_recursive.test
View File

@ -2819,6 +2819,27 @@ drop table folks;
set big_tables=@save_big_tables;
--echo #
--echo # MDEV-26135: execution of PS for query with hanging recursive CTE
--echo #
create table t1 (a int);
insert into t1 values (5), (7);
create table t2 (b int);
insert into t2 values (3), (7), (1);
let $q=
with recursive r as (select a from t1 union select a+1 from r where a < 10)
select * from t2;
eval $q;
eval prepare stmt from "$q";
execute stmt;
execute stmt;
deallocate prepare stmt;
drop table t1,t2;
--echo #
--echo # End of 10.2 tests
--echo #

6
sql/sql_union.cc
View File

@ -1382,7 +1382,8 @@ bool st_select_lex_unit::cleanup()
{
DBUG_RETURN(FALSE);
}
if (with_element && with_element->is_recursive && union_result)
if (with_element && with_element->is_recursive && union_result &&
with_element->rec_outer_references)
{
select_union_recursive *result= with_element->rec_result;
if (++result->cleanup_count == with_element->rec_outer_references)
@ -1584,7 +1585,8 @@ bool st_select_lex::cleanup()
for (SELECT_LEX_UNIT *lex_unit= first_inner_unit(); lex_unit ;
lex_unit= lex_unit->next_unit())
{
if (lex_unit->with_element && lex_unit->with_element->is_recursive)
if (lex_unit->with_element && lex_unit->with_element->is_recursive &&
lex_unit->with_element->rec_outer_references)
continue;
error= (bool) ((uint) error | (uint) lex_unit->cleanup());
}