diff options
| author | Monty <monty@mariadb.org> | 2015-11-06 13:02:19 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-11-10 13:46:57 +0200 |
| commit | e3868ee07273b1ea2c495d92891fd7d1ed1eea9e (patch) | |
| tree | 63e0bc0ba9c05cf3fb098b83cbb6782df47a8897 /sql/field.cc | |
| parent | 93d1e5ce0b841bedbc071da85995f15611ed3d34 (diff) | |
| download | mariadb-git-e3868ee07273b1ea2c495d92891fd7d1ed1eea9e.tar.gz | |
Don't store vcol bitmaps in TABLE if table doesn't have virtual fields.
(Makes TABLE a bit smaller)
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index e3794986161..585abad2cdc 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -71,7 +71,7 @@ const char field_separator=','; ((ulong) ((1LL << MY_MIN(arg, 4) * 8) - 1)) #define ASSERT_COLUMN_MARKED_FOR_READ DBUG_ASSERT(!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))) -#define ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED DBUG_ASSERT(is_stat_field || !table || (!table->write_set || bitmap_is_set(table->write_set, field_index) || bitmap_is_set(table->vcol_set, field_index))) +#define ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED DBUG_ASSERT(is_stat_field || !table || (!table->write_set || bitmap_is_set(table->write_set, field_index) || (table->vcol_set && bitmap_is_set(table->vcol_set, field_index)))) #define FLAGSTR(S,F) ((S) & (F) ? #F " " : "") |