Cleanup: unwrapped large block in vers_setup_conds()

This commit is contained in:
Aleksey Midenkov 2017-12-13 12:14:34 +03:00
parent 717f274b87
commit 22f45062de

View file

@ -823,8 +823,9 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables, COND **where_expr
for (table= tables; table; table= table->next_local)
{
if (table->table && table->table->versioned())
{
if (!table->table || !table->table->versioned())
continue;
vers_select_conds_t &vers_conditions= table->vers_conditions;
// propagate system_time from nearest outer SELECT_LEX
@ -1012,7 +1013,6 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables, COND **where_expr
if (table->is_view_or_derived())
vers_cond= or_items(thd, vers_cond, newx Item_func_isnull(thd, row_end));
}
} // if (... table->table->versioned())
} // for (table= tables; ...)
if (vers_cond)