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.1' into 10.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-07-26 07:03:39 +02:00
parent fc77a66c7e 584d213235
commit cf8c2a3c3b
65 changed files with 3227 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@ -1262,7 +1262,6 @@ JOIN::optimize_inner()
DBUG_RETURN(1); /* purecov: inspected */
/* dump_TABLE_LIST_graph(select_lex, select_lex->leaf_tables); */
select_lex->update_used_tables();
}
eval_select_list_used_tables();
@ -1332,6 +1331,8 @@ JOIN::optimize_inner()
sel->where= conds;
select_lex->update_used_tables();
if (arena)
thd->restore_active_arena(arena, &backup);
}
@ -13074,6 +13075,9 @@ static bool check_simple_equality(THD *thd, const Item::Context &ctx,
{
if (((Item_ref*)left_item)->get_depended_from())
return FALSE;
if (((Item_direct_view_ref*)left_item)->get_null_ref_table() !=
NO_NULL_TABLE && !left_item->real_item()->used_tables())
return FALSE;
left_item= left_item->real_item();
}
if (right_item->type() == Item::REF_ITEM &&
@ -13081,6 +13085,9 @@ static bool check_simple_equality(THD *thd, const Item::Context &ctx,
{
if (((Item_ref*)right_item)->get_depended_from())
return FALSE;
if (((Item_direct_view_ref*)right_item)->get_null_ref_table() !=
NO_NULL_TABLE && !right_item->real_item()->used_tables())
return FALSE;
right_item= right_item->real_item();
}
if (left_item->type() == Item::FIELD_ITEM &&