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

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2018-04-29 00:38:10 +02:00
parent d6dbe8e207 5cfe52314e
commit c4499a0391
15 changed files with 228 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -1143,9 +1143,6 @@ TODO: make view to decide if it is possible to write to WHERE directly or make S
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 */
@ -1207,6 +1204,9 @@ TODO: make view to decide if it is possible to write to WHERE directly or make S
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);