From afe6eb499d7d5d9b4ba9de5746e78b43f25e31a4 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 14 Aug 2019 20:27:00 +0400 Subject: 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. --- sql/opt_sum.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/opt_sum.cc') diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 884dd089c52..0a3c30a176d 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -904,7 +904,7 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref, Field* field, COND *cond, uint *range_fl, uint *prefix_len) { - if (!(field->flags() & PART_KEY_FLAG)) + if (!(field->flags & PART_KEY_FLAG)) return FALSE; // Not key field DBUG_ENTER("find_key_for_maxmin"); @@ -937,7 +937,7 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref, /* Check whether the index component is partial */ Field *part_field= table->field[part->fieldnr-1]; - if ((part_field->flags() & BLOB_FLAG) || + if ((part_field->flags & BLOB_FLAG) || part->length < part_field->key_length()) break; -- cgit v1.2.1