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 /plugin/handler_socket | |
| 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 'plugin/handler_socket')
| -rw-r--r-- | plugin/handler_socket/handlersocket/database.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp index 8dfe542f881..52ea8f2a8c4 100644 --- a/plugin/handler_socket/handlersocket/database.cpp +++ b/plugin/handler_socket/handlersocket/database.cpp @@ -903,7 +903,7 @@ dbcontext::fill_filter_buf(TABLE *table, const prep_stmt& pst, } const uint32_t fn = pst.get_filter_fields()[f->ff_offset]; Field *const fld = table->field[fn]; - if ((fld->flags() & BLOB_FLAG) != 0) { + if ((fld->flags & BLOB_FLAG) != 0) { return false; } fld->store(f->val.begin(), f->val.size(), &my_charset_bin); |