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

MDEV-23619: Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-11-13 21:54:32 +02:00
parent d7a5824899 b63dc3f370
commit ca331bdcda
5 changed files with 317 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@ -13768,6 +13768,9 @@ void JOIN::join_free()
for (tmp_unit= select_lex->first_inner_unit();
tmp_unit;
tmp_unit= tmp_unit->next_unit())
{
if (tmp_unit->with_element && tmp_unit->with_element->is_recursive)
continue;
for (sl= tmp_unit->first_select(); sl; sl= sl->next_select())
{
Item_subselect *subselect= sl->master_unit()->item;
@ -13785,7 +13788,7 @@ void JOIN::join_free()
/* Can't unlock if at least one JOIN is still needed */
can_unlock= can_unlock && full_local;
}
}
/*
We are not using tables anymore
Unlock all tables. We may be in an INSERT .... SELECT statement.