MDEV-36682 Conflict between MDEV-36504 and MDEV-16329

Thirunarayanan · Thirunarayanan · commit 5f69e1815206 · 2025-04-24T14:27:29.000+05:30
Reason:
=======
- MDEV-16239 does apply the DML logs after bulk insert for
ALTER TABLE..ALGORITHM=COPY, but InnoDB fails to reset the bulk_insert
in ha_innobase::extra(HA_EXTRA_END_ALTER_COPY). This leads to crash
while applying DML logs.

Solution:
=======
ha_innobase::extra(HA_EXTRA_END_ALTER_COPY): Reset TRX_DDL_BULK at the
end of bulk insert operation
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -15939,7 +15939,7 @@ ha_innobase::extra(
 		}
 
 		trx->end_bulk_insert(*m_prebuilt->table);
-		trx->bulk_insert &= TRX_DDL_BULK;
+		trx->bulk_insert &= TRX_DML_BULK;
 		if (!m_prebuilt->table->is_temporary()
 		    && !high_level_read_only) {
 			/* During copy_data_between_tables(), InnoDB only

Original file line number	Diff line number	Diff line change
`@@ -15939,7 +15939,7 @@ ha_innobase::extra(`
`15939`	`15939`	`}`
`15940`	`15940`
`15941`	`15941`	`trx->end_bulk_insert(*m_prebuilt->table);`
`15942`		`- trx->bulk_insert &= TRX_DDL_BULK;`
	`15942`	`+ trx->bulk_insert &= TRX_DML_BULK;`
`15943`	`15943`	`if (!m_prebuilt->table->is_temporary()`
`15944`	`15944`	`&& !high_level_read_only) {`
`15945`	`15945`	`/* During copy_data_between_tables(), InnoDB only`