mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.1' into 10.2

Browse source
This commit is contained in:
Sergei Golubchik 2018-05-10 13:01:42 +02:00
commit 9b1824dcd2
145 changed files with 2294 additions and 2627 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_select.cc
View file

@ -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);