Skip to content

Commit 8c239ed

Browse files
committed
PS-9293, PS-9328: Revert of fix for PS-7666: Assertion failure: fil0fil.cc:13097:fil_system->shard_by_id(id)->mutex_owned().
Reverted Percona Server's fix for PS-7666 as it became redundant after Upstream's has fixed the problem in a different way. See the Upstream's fix for bug#32819101 "ASSERTION FAILURE: FIL0FIL.CC: 12089:FIL_SYSTEM->SHARD_BY_ID(ID)->MUTEX_OWNED()" for details: 4a2cf86 Removed Percona's test case as well, as Upstream fix comes with one.
1 parent 646a7cf commit 8c239ed

File tree

3 files changed

+0
-61
lines changed

3 files changed

+0
-61
lines changed

mysql-test/suite/innodb/r/drop_table_crash_debug.result

Lines changed: 0 additions & 23 deletions
This file was deleted.

mysql-test/suite/innodb/t/drop_table_crash_debug.test

Lines changed: 0 additions & 32 deletions
This file was deleted.

storage/innobase/fil/fil0fil.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3207,10 +3207,7 @@ static bool fil_space_free(space_id_t space_id, bool x_latched) {
32073207
rw_lock_x_unlock(&space->latch);
32083208
}
32093209

3210-
shard->mutex_acquire();
32113210
Fil_shard::space_free_low(space);
3212-
shard->mutex_release();
3213-
32143211
ut_a(space == nullptr);
32153212

32163213
return true;
@@ -4572,9 +4569,6 @@ dberr_t Fil_shard::space_delete(space_id_t space_id, buf_remove_t buf_remove) {
45724569

45734570
mtr.commit();
45744571

4575-
DBUG_EXECUTE_IF("delete_crash", log_buffer_flush_to_disk();
4576-
DBUG_SUICIDE(););
4577-
45784572
/* Even if we got killed shortly after deleting the
45794573
tablespace file, the record must have already been
45804574
written to the redo log. */

0 commit comments

Comments
 (0)