diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
| commit | c32f71af7e4b747de223bf6b44e691941f5997cf (patch) | |
| tree | 03270b9a849e165f1c8605102ee06bced2331477 /sql/sql_lex.cc | |
| parent | 4d41f316c3c1c05fdd35cbdc1b626d596b89af40 (diff) | |
| parent | 555c6632c69d707cc1641ef396e7b66a65f14bdc (diff) | |
| download | mariadb-git-c32f71af7e4b747de223bf6b44e691941f5997cf.tar.gz | |
Merge branch '10.2' into 10.3
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 89f74b6537b..aee7d629618 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -4088,7 +4088,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(); |