diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-04-11 16:23:49 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 12:48:23 +0200 |
commit | 88a0bb83dfa1746571c99503f1cfd586f63e9a17 (patch) | |
tree | 53d85af13bd9fac14e20cf098c159ae8ce4a87a0 /sql/table.cc | |
parent | 8ba0eea65cd7cc02314a9e1ab954808d16461888 (diff) | |
download | mariadb-git-88a0bb83dfa1746571c99503f1cfd586f63e9a17.tar.gz |
MDEV-15626 Assertion on update virtual column in partitioned table
table.cc:
virtual columns must be computed for INSERT, if they're part
of the partitioning expression.
this change broke gcol.gcol_partition_innodb.
fix CHECK TABLE for partitioned tables and vcols.
sql_partition.cc:
mark prerequisite base columns in full_part_field_set
ha_partition.cc
initialize vcol_set accordingly
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 4e9aa5caff2..4e242e3f12e 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -6629,7 +6629,7 @@ bool TABLE::mark_virtual_columns_for_write(bool insert_fl) if (bitmap_is_set(write_set, tmp_vfield->field_index)) bitmap_updated= mark_virtual_col(tmp_vfield); else if (tmp_vfield->vcol_info->stored_in_db || - (tmp_vfield->flags & PART_KEY_FLAG)) + (tmp_vfield->flags & (PART_KEY_FLAG | FIELD_IN_PART_FUNC_FLAG))) { if (insert_fl) { |