diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-05-19 12:36:58 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-05-19 12:36:58 +0400 |
| commit | 49b29e35b2099fcbc3342814fc0ce9c17ba1bdeb (patch) | |
| tree | e830a8a54e6640c3e30d171f4ad6e37f347e146d /sql/sql_tvc.cc | |
| parent | 3ea05d08427dc3d679fef838e9334685f556cc32 (diff) | |
| parent | 810b7f8ecbea0fbf52e03aa710a8059ea301f7dc (diff) | |
| download | mariadb-git-49b29e35b2099fcbc3342814fc0ce9c17ba1bdeb.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'sql/sql_tvc.cc')
| -rw-r--r-- | sql/sql_tvc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index e228b3ca211..999563275f4 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -59,7 +59,8 @@ 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(thd, 0) || + item->check_is_evaluable_expression_or_error()) DBUG_RETURN(true); } } |