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/sql_class.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/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 1c48f027e70..9078396a575 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -6708,7 +6708,7 @@ void THD::binlog_prepare_row_images(TABLE *table) { Field *field= (*ptr); if ((field->type() == MYSQL_TYPE_BLOB) && - !(field->flags() & PRI_KEY_FLAG)) + !(field->flags & PRI_KEY_FLAG)) bitmap_clear_bit(&table->tmp_set, field->field_index); } break; |