Skip to content

Commit 882f820

Browse files
committed
MDEV-27451 gcol.virtual_index_drop fails with LeakSanitizer errors
Because commit 24773bf made dict_v_col_t encapsulate v_indexes, we must invoke dict_v_col_t::~dict_v_col_t() to destruct the container. This basically is a fixup of the merge commit 5008171 of the 10.2 commit cf2c6b7 (MDEV-24971). I did not debug why no leaks are reported for 10.2 or 10.3.
1 parent 49e3bd2 commit 882f820

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

storage/innobase/handler/handler0alter.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8914,6 +8914,14 @@ rollback_inplace_alter_table(
89148914

89158915
row_mysql_unlock_data_dictionary(prebuilt->trx);
89168916
}
8917+
8918+
if (ctx->add_vcol) {
8919+
for (ulint i = 0; i < ctx->num_to_add_vcol; i++) {
8920+
ctx->add_vcol[i].~dict_v_col_t();
8921+
}
8922+
ctx->num_to_add_vcol = 0;
8923+
ctx->add_vcol = nullptr;
8924+
}
89178925
}
89188926

89198927
/* Reset dict_col_t::ord_part for those columns fail to be indexed,

0 commit comments

Comments
 (0)