database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2018-05-05 14:01:59 +02:00
parent 39d248fa55 3c07ed141c
commit 9989c26bc9
178 changed files with 3829 additions and 2475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -1148,9 +1148,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 */
@ -1212,6 +1209,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);