diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-14 20:27:00 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-14 20:27:00 +0400 |
| commit | afe6eb499d7d5d9b4ba9de5746e78b43f25e31a4 (patch) | |
| tree | 8755d77c5aca99ddc5bafc874e5f550be85e6f45 /sql/unireg.cc | |
| parent | e86010f909fb6b8c4ffd9d6df92991ac079e67e7 (diff) | |
| download | mariadb-git-afe6eb499d7d5d9b4ba9de5746e78b43f25e31a4.tar.gz | |
Revert "MDEV-20342 Turn Field::flags from a member to a method"
This reverts commit e86010f909fb6b8c4ffd9d6df92991ac079e67e7.
Reverting on Monty's request, as this change makes merging
things from 10.5 to 10.2 much harder.
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 6761172ff93..7130b3e5d8a 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -104,7 +104,7 @@ static uchar *extra2_write_field_properties(uchar *pos, while (Create_field *cf= it++) { uchar flags= cf->invisible; - if (cf->flags() & VERS_UPDATE_UNVERSIONED_FLAG) + if (cf->flags & VERS_UPDATE_UNVERSIONED_FLAG) flags|= VERS_OPTIMIZED_UPDATE; *pos++= flags; } @@ -141,7 +141,7 @@ bool has_extra2_field_flags(List<Create_field> &create_fields) { if (f->invisible) return true; - if (f->flags() & VERS_UPDATE_UNVERSIONED_FLAG) + if (f->flags & VERS_UPDATE_UNVERSIONED_FLAG) return true; } return false; @@ -1147,7 +1147,7 @@ static bool make_empty_rec(THD *thd, uchar *buff, uint table_options, Field *regfield= tmp.make_field(&share, thd->mem_root, &addr, field->type_handler(), &field->field_name, - field->flags()); + field->flags); if (!regfield) { error= true; @@ -1157,7 +1157,7 @@ static bool make_empty_rec(THD *thd, uchar *buff, uint table_options, /* save_in_field() will access regfield->table->in_use */ regfield->init(&table); - if (!(field->flags() & NOT_NULL_FLAG)) + if (!(field->flags & NOT_NULL_FLAG)) { *regfield->null_ptr|= regfield->null_bit; null_count++; |