diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 13:28:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 13:28:12 +0300 |
| commit | a8379e53e8fa2f0c091daaf28b095d652e224952 (patch) | |
| tree | 20ad6e6dbacd01c43298d11f1b4c77bce50165f9 /sql/field.h | |
| parent | ebd52051206620a0944ffc084582532c0c394523 (diff) | |
| parent | aae72f821abbee4d63a0925c06b18422d4c08ee8 (diff) | |
| download | mariadb-git-a8379e53e8fa2f0c091daaf28b095d652e224952.tar.gz | |
Merge 10.5 into 10.6
The changes to galera.galear_var_replicate_myisam_on
in commit d9b933bec6061758c5d7b34f55afcae32a85c110
are omitted due to conflicts
with commit 27d66d644cf2ebe9201e0362f2050036cce2908a.
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 94a45d23802..0408ae90b3f 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1800,7 +1800,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 @@ -5306,7 +5306,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(); |