summaryrefslogtreecommitdiff
path: root/sql/partition_info.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-08-14 20:27:00 +0400
committerAlexander Barkov <bar@mariadb.com>2019-08-14 20:27:00 +0400
commitafe6eb499d7d5d9b4ba9de5746e78b43f25e31a4 (patch)
tree8755d77c5aca99ddc5bafc874e5f550be85e6f45 /sql/partition_info.cc
parente86010f909fb6b8c4ffd9d6df92991ac079e67e7 (diff)
downloadmariadb-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/partition_info.cc')
-rw-r--r--sql/partition_info.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 8f353299f4a..66216493de8 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -902,7 +902,7 @@ bool partition_info::vers_setup_expression(THD * thd, uint32 alter_add)
part_field_list.push_back(row_end->field_name.str, thd->mem_root);
DBUG_ASSERT(part_field_list.elements == 1);
// needed in handle_list_of_fields()
- row_end->add_flags(GET_FIXED_FIELDS_FLAG);
+ row_end->flags|= GET_FIXED_FIELDS_FLAG;
}
if (alter_add)