summaryrefslogtreecommitdiff
path: root/sql/rpl_record.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-06-01 16:59:21 +0200
committerSergei Golubchik <serg@mariadb.org>2018-06-04 12:32:23 +0200
commit45dee3fc83f1f88115e60b72398c7f6b66bfde40 (patch)
treed9a203a3bd5ed5e6f2c270246da3642ce996af44 /sql/rpl_record.cc
parentac9cc638923836cb7f0d44d1919ad2d5afc2a9f4 (diff)
downloadmariadb-git-45dee3fc83f1f88115e60b72398c7f6b66bfde40.tar.gz
cleanup: remove TABLE::vcol_set
use a read_set instead. a bit in the read_set means "the field value is needed" (read or generated, whatever it takes).
Diffstat (limited to 'sql/rpl_record.cc')
-rw-r--r--sql/rpl_record.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index db579a63ce0..94c1f08e4e3 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -497,7 +497,9 @@ int prepare_record(TABLE *const table, const uint skip, const bool check)
DBUG_RETURN(0);
}
/**
- Fills @c table->record[0] with computed values of extra persistent column which are present on slave but not on master.
+ Fills @c table->record[0] with computed values of extra persistent column
+ which are present on slave but not on master.
+
@param table Table whose record[0] buffer is prepared.
@param master_cols No of columns on master
@returns 0 on success
@@ -514,10 +516,8 @@ int fill_extra_persistent_columns(TABLE *table, int master_cols)
vfield= *vfield_ptr;
if (vfield->field_index >= master_cols && vfield->stored_in_db())
{
- /*Set bitmap for writing*/
- bitmap_set_bit(table->vcol_set, vfield->field_index);
+ bitmap_set_bit(table->write_set, vfield->field_index);
error= vfield->vcol_info->expr->save_in_field(vfield,0);
- bitmap_clear_bit(table->vcol_set, vfield->field_index);
}
}
return error;