diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 06:27:55 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 06:27:55 +0300 |
commit | 4f29d776c756ac522ae49c481ea8975dee8787fe (patch) | |
tree | d152b05f3bca9b4022802654c129f0470ed92038 /sql/sql_tvc.cc | |
parent | a4996f951d731322acc63033646d950ddbb0f60c (diff) | |
parent | 3eadb135fd7b7e2d40fd6b9a819ac3245043f781 (diff) | |
download | mariadb-git-4f29d776c756ac522ae49c481ea8975dee8787fe.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_tvc.cc')
-rw-r--r-- | sql/sql_tvc.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index 5265d254a05..326692cf018 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -52,7 +52,14 @@ bool fix_fields_for_tvc(THD *thd, List_iterator_fast<List_item> &li) while ((item= it++)) { - if (item->fix_fields(thd, 0)) + /* + Some items have already been fixed. + For example Item_splocal items get fixed in + Item_splocal::append_for_log(), which is called from subst_spvars() + while replacing their values to NAME_CONST()s. + So fix only those that have not been. + */ + if (item->fix_fields_if_needed(thd, 0)) DBUG_RETURN(true); } } |