diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
| commit | 9b1824dcd2564c803e58d02ac63b49ec68bd60d2 (patch) | |
| tree | beef3faf3e0e6b8264014a0cfb735d4a32be6cbc /sql/sql_select.cc | |
| parent | 92a13148e80c30422ae5460032169cbe1946fa6d (diff) | |
| parent | ff579bc814551026a3271fac274f560cef3f523f (diff) | |
| download | mariadb-git-9b1824dcd2564c803e58d02ac63b49ec68bd60d2.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 30ef26f67e2..4df4c0c87e1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1252,9 +1252,6 @@ JOIN::optimize_inner() eval_select_list_used_tables(); - if (optimize_constant_subqueries()) - DBUG_RETURN(1); - table_count= select_lex->leaf_tables.elements; if (setup_ftfuncs(select_lex)) /* should be after having->fix_fields */ @@ -1318,6 +1315,9 @@ JOIN::optimize_inner() thd->restore_active_arena(arena, &backup); } + if (optimize_constant_subqueries()) + DBUG_RETURN(1); + if (setup_jtbm_semi_joins(this, join_list, &conds)) DBUG_RETURN(1); |