diff options
Diffstat (limited to 'sql/sql_tvc.cc')
| -rw-r--r-- | sql/sql_tvc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index 5f732d474f8..9a7084cdca2 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -78,7 +78,7 @@ bool fix_fields_for_tvc(THD *thd, List_iterator_fast<List_item> &li) while ((lst= li++)) { - List_iterator_fast<Item> it(*lst); + List_iterator<Item> it(*lst); Item *item; while ((item= it++)) @@ -90,7 +90,7 @@ bool fix_fields_for_tvc(THD *thd, List_iterator_fast<List_item> &li) while replacing their values to NAME_CONST()s. So fix only those that have not been. */ - if (item->fix_fields_if_needed(thd, 0) || + if (item->fix_fields_if_needed_for_scalar(thd, it.ref()) || item->check_is_evaluable_expression_or_error()) DBUG_RETURN(true); } |