@@ -165,10 +165,7 @@ static void instant_metadata_lock(dict_index_t& index, mtr_t& mtr)
165
165
}
166
166
167
167
/* * Initialize instant->field_map.
168
- @tparam replace_dropped whether to point clustered index fields
169
- to instant->dropped[]
170
168
@param[in] table table definition to copy from */
171
- template <bool replace_dropped>
172
169
inline void dict_table_t::init_instant (const dict_table_t & table)
173
170
{
174
171
const dict_index_t & oindex __attribute__ ((unused))= *table.indexes .start ;
@@ -209,12 +206,10 @@ inline void dict_table_t::init_instant(const dict_table_t& table)
209
206
ut_ad (f.col < table.instant ->dropped
210
207
+ table.instant ->n_dropped );
211
208
ut_d (n_drop++);
212
- if (replace_dropped) {
213
- size_t d = f.col - table.instant ->dropped ;
214
- ut_ad (f.col == &table.instant ->dropped [d]);
215
- ut_ad (d <= instant->n_dropped );
216
- f.col = &instant->dropped [d];
217
- }
209
+ size_t d = f.col - table.instant ->dropped ;
210
+ ut_ad (f.col == &table.instant ->dropped [d]);
211
+ ut_ad (d <= instant->n_dropped );
212
+ f.col = &instant->dropped [d];
218
213
}
219
214
ut_ad (n_drop == n_dropped ());
220
215
ut_ad (field_map_it == &instant->field_map [index.n_fields - u]);
@@ -655,7 +650,7 @@ inline bool dict_table_t::instant_column(const dict_table_t& table,
655
650
const field_map_element_t * field_map = old_instant
656
651
? old_instant->field_map : NULL ;
657
652
658
- init_instant< true > (table);
653
+ init_instant (table);
659
654
660
655
if (!metadata_changed) {
661
656
metadata_changed = !field_map
0 commit comments