Skip to content
Permalink
Browse files
Follow-up fix of MDEV-13795/MDEV-14332
row_log_table_apply_op(): Remove references to dict_table_t::n_vcols.
Virtual column information is no longer being written to the log.

row_log_t: Remove the unused fields n_old_col, n_old_vcol.
  • Loading branch information
dr-m committed Nov 10, 2017
1 parent 5d142f9 commit 9618c04
Showing 1 changed file with 0 additions and 21 deletions.
@@ -203,11 +203,6 @@ struct row_log_t {
byte* crypt_head; /*!< reader context;
temporary buffer used in encryption,
decryption or NULL */
ulint n_old_col;
/*!< number of non-virtual column in
old table */
ulint n_old_vcol;
/*!< number of virtual column in old table */
const char* path; /*!< where to create temporary file during
log operation */
};
@@ -2334,13 +2329,6 @@ row_log_table_apply_op(

next_mrec = mrec + rec_offs_data_size(offsets);

if (log->table->n_v_cols) {
if (next_mrec + 2 > mrec_end) {
return(NULL);
}
next_mrec += mach_read_from_2(next_mrec);
}

if (next_mrec > mrec_end) {
return(NULL);
} else {
@@ -2375,13 +2363,6 @@ row_log_table_apply_op(
rec_offs_set_n_fields(offsets, new_index->n_uniq + 2);
rec_init_offsets_temp(mrec, new_index, offsets);
next_mrec = mrec + rec_offs_data_size(offsets) + ext_size;
if (log->table->n_v_cols) {
if (next_mrec + 2 > mrec_end) {
return(NULL);
}

next_mrec += mach_read_from_2(next_mrec);
}

if (next_mrec > mrec_end) {
return(NULL);
@@ -3092,8 +3073,6 @@ row_log_allocate(
log->head.blocks = log->head.bytes = 0;
log->head.total = 0;
log->path = path;
log->n_old_col = index->table->n_cols;
log->n_old_vcol = index->table->n_v_cols;

dict_index_set_online_status(index, ONLINE_INDEX_CREATION);
index->online_log = log;

0 comments on commit 9618c04

Please sign in to comment.