database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Revert "MDEV-20342 Turn Field::flags from a member to a method"

Browse Source 
This reverts commit e86010f909.

Reverting on Monty's request, as this change makes merging
things from 10.5 to 10.2 much harder.
This commit is contained in:
Alexander Barkov
2019-08-14 20:27:00 +04:00
parent e86010f909
commit afe6eb499d
59 changed files with 453 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/handler_socket/handlersocket/database.cpp
View File

@@ -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);