diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 17:56:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 17:56:08 +0300 |
| commit | 0025eb3f963fdca88028ff14a27d9b9638079337 (patch) | |
| tree | 09ae14a45e658e6783b8a3c57a955a931194c03e /sql/sql_lex.cc | |
| parent | c19335ea5359923c918b07ef9892c14408414b4d (diff) | |
| parent | 4668e079eed635c9ff19a39e584202d3a4e590c1 (diff) | |
| download | mariadb-git-0025eb3f963fdca88028ff14a27d9b9638079337.tar.gz | |
Merge mariadb-10.3.24
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 1ef917f6964..4f64dbfbbf9 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -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(); |