@@ -253,18 +253,18 @@ struct RPL_TABLE_LIST
253
253
: public TABLE_LIST
254
254
{
255
255
bool m_tabledef_valid;
256
+ bool master_had_triggers;
256
257
table_def m_tabledef;
257
258
TABLE *m_conv_table;
258
- bool master_had_triggers;
259
259
const Copy_field *m_online_alter_copy_fields;
260
260
const Copy_field *m_online_alter_copy_fields_end;
261
261
262
262
RPL_TABLE_LIST (const LEX_CSTRING *db_arg, const LEX_CSTRING *table_name_arg,
263
263
thr_lock_type thr_lock_type,
264
264
table_def &&tabledef, bool master_had_trigers)
265
265
: TABLE_LIST(db_arg, table_name_arg, NULL , thr_lock_type),
266
- m_tabledef_valid (true ), m_tabledef(std::move(tabledef) ),
267
- m_conv_table( NULL ), master_had_triggers(master_had_trigers ),
266
+ m_tabledef_valid (true ), master_had_triggers(master_had_trigers ),
267
+ m_tabledef(std::move(tabledef)), m_conv_table( NULL ),
268
268
m_online_alter_copy_fields(NULL ),
269
269
m_online_alter_copy_fields_end(NULL )
270
270
{}
@@ -275,8 +275,9 @@ struct RPL_TABLE_LIST
275
275
const Copy_field *online_alter_copy_fields_end)
276
276
: TABLE_LIST(table, lock_type),
277
277
m_tabledef_valid(true ),
278
+ master_had_triggers(false ),
278
279
m_tabledef(std::move(tabledef)),
279
- m_conv_table(conv_table), master_had_triggers( false ),
280
+ m_conv_table(conv_table),
280
281
m_online_alter_copy_fields(online_alter_copy_fields),
281
282
m_online_alter_copy_fields_end(online_alter_copy_fields_end)
282
283
{}
0 commit comments