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

Merge mariadb-10.3.24

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-10 17:56:08 +03:00
parent c19335ea53 4668e079ee
commit 0025eb3f96
154 changed files with 1883 additions and 914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_lex.cc
View File

@ -4097,7 +4097,8 @@ bool st_select_lex::optimize_unflattened_subqueries(bool const_only)
sl->options|= SELECT_DESCRIBE;
inner_join->select_options|= SELECT_DESCRIBE;
}
res= inner_join->optimize();
if ((res= inner_join->optimize()))
return TRUE;
if (!inner_join->cleaned)
sl->update_used_tables();
sl->update_correlated_cache();