diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:33:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:33:56 +0300 |
| commit | 99bb3fb656f4a2a06c808b7c5d50e18e4c44b73b (patch) | |
| tree | 121d54271137b00d58b23505644be3bc3a819a9e /sql/field.h | |
| parent | cda072bb4ba9e01d523d8deb995f28aa7a19fe11 (diff) | |
| parent | a736a3174a4e7c0d92a38901ae61f563d4afede7 (diff) | |
| download | mariadb-git-99bb3fb656f4a2a06c808b7c5d50e18e4c44b73b.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 6ada7f94507..6747f8070dc 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1797,7 +1797,7 @@ public: bool vers_sys_field() const { - return flags & (VERS_SYS_START_FLAG | VERS_SYS_END_FLAG); + return flags & (VERS_ROW_START | VERS_ROW_END); } bool vers_update_unversioned() const @@ -5305,7 +5305,7 @@ public: } bool vers_sys_field() const { - return flags & (VERS_SYS_START_FLAG | VERS_SYS_END_FLAG); + return flags & (VERS_ROW_START | VERS_ROW_END); } void create_length_to_internal_length_bit(); void create_length_to_internal_length_newdecimal(); |