Commit 5fd00883 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

MDEV-8058: funcs_1.innodb_views and funcs_1.memory_views fail

The double call of ref used tables fixed.
parent f8320210
......@@ -9806,12 +9806,14 @@ table_map Item_direct_view_ref::used_tables() const
return OUTER_REF_TABLE_BIT;
if (view->is_merged_derived() || view->merged || !view->table)
return ((*ref)->used_tables() ?
(*ref)->used_tables() :
{
table_map used= (*ref)->used_tables();
return (used ?
used :
((null_ref_table != NO_NULL_TABLE) ?
null_ref_table->map :
(table_map)0 ));
}
return view->table->map;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment