diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-17 19:14:32 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-17 19:14:32 +0200 |
commit | 4f13509eea8078dfc986e33fe48036cfaaf31b02 (patch) | |
tree | ba729f0eac4e0febc4c46a7b2be7cbd5cc9e1f6e /sql/table.h | |
parent | 35b831d97193d0f8f0bf0ffdaf12218cf091e568 (diff) | |
parent | 648bedf0e52132c1cbc28cd4a88fb576da1088ca (diff) | |
download | mariadb-git-4f13509eea8078dfc986e33fe48036cfaaf31b02.tar.gz |
Merge branch 'bb-10.10-release' into bb-10.11-release
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index d264904bbd6..f9ac2428d25 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1704,7 +1704,7 @@ public: uint actual_n_key_parts(KEY *keyinfo); ulong actual_key_flags(KEY *keyinfo); - int update_virtual_field(Field *vf); + int update_virtual_field(Field *vf, bool ignore_warnings); int update_virtual_fields(handler *h, enum_vcol_update_mode update_mode); int update_default_fields(bool ignore_errors); void evaluate_update_default_function(); |