Commit 4e7ffc83 authored by Marko Mäkelä's avatar Marko Mäkelä

Remove unused code and clarify comments

parent fa21647a
...@@ -1603,21 +1603,6 @@ struct dict_table_t { ...@@ -1603,21 +1603,6 @@ struct dict_table_t {
return NULL; return NULL;
} }
/** Get the n-drop columns till the given n_cols.
@param[in] n_cols number of old columns
@return number of drop columns */
static unsigned get_n_drop_cols(const ulint* col_map, unsigned n_cols)
{
unsigned n_drop_cols = 0;
for (ulint i = 0; i < n_cols; i++) {
if (col_map[i] == ULINT_UNDEFINED) {
n_drop_cols++;
}
}
return n_drop_cols;
}
/** Serialise metadata of dropped or reordered columns. /** Serialise metadata of dropped or reordered columns.
@param[in,out] heap memory heap for allocation @param[in,out] heap memory heap for allocation
@param[out] field data field with the metadata */ @param[out] field data field with the metadata */
......
...@@ -1560,7 +1560,8 @@ row_log_table_apply_convert_mrec( ...@@ -1560,7 +1560,8 @@ row_log_table_apply_convert_mrec(
= dict_field_get_col(ind_field); = dict_field_get_col(ind_field);
if (col->is_dropped()) { if (col->is_dropped()) {
ut_ad(index->is_instant()); /* the column was instantly dropped earlier */
ut_ad(index->table->instant);
continue; continue;
} }
...@@ -1568,6 +1569,7 @@ row_log_table_apply_convert_mrec( ...@@ -1568,6 +1569,7 @@ row_log_table_apply_convert_mrec(
= log->col_map[dict_col_get_no(col)]; = log->col_map[dict_col_get_no(col)];
if (col_no == ULINT_UNDEFINED) { if (col_no == ULINT_UNDEFINED) {
/* the column is being dropped now */
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment