summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-01-05 01:07:03 +0200
committerMonty <monty@mariadb.org>2017-01-11 09:19:45 +0200
commit135e144479c70d8e470e67fd95e4b17051127952 (patch)
tree1fbca0bf595cae0ee787192e2948c8690220844d /sql/field.h
parentde22cd3fe5caa1db8839701e45f379b3b5be7328 (diff)
downloadmariadb-git-135e144479c70d8e470e67fd95e4b17051127952.tar.gz
MDEV-11598 Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed
Found and fixed 2 problems: - Filesort addon fields didn't mark virtual columns properly - multi-range-read calculated vcol bitmap but was not using it. This caused wrong vcol field to be calculated on read, which caused the assert.
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h
index 400d2ef0e5e..fd68ade1165 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1475,6 +1475,9 @@ public:
bool save_in_field_default_value(bool view_eror_processing);
bool save_in_field_ignore_value(bool view_error_processing);
+ /* Mark field in read map. Updates also virtual fields */
+ void register_field_in_read_map();
+
friend int cre_myisam(char * name, register TABLE *form, uint options,
ulonglong auto_increment_value);
friend class Copy_field;