Skip to content

Commit 8ce2deb

Browse files
authored
Merge pull request #5404 from dlenev/ps-8.0-7666-revert
PS-9293, PS-9328: Revert of fix for PS-7666: Assertion failure: fil0f… (8.0 version)
2 parents 65971fd + 8c239ed commit 8ce2deb

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
@@ -3212,10 +3212,7 @@ static bool fil_space_free(space_id_t space_id, bool x_latched) {
32123212
rw_lock_x_unlock(&space->latch);
32133213
}
32143214

3215-
shard->mutex_acquire();
32163215
Fil_shard::space_free_low(space);
3217-
shard->mutex_release();
3218-
32193216
ut_a(space == nullptr);
32203217

32213218
return true;
@@ -4577,9 +4574,6 @@ dberr_t Fil_shard::space_delete(space_id_t space_id, buf_remove_t buf_remove) {
45774574

45784575
mtr.commit();
45794576

4580-
DBUG_EXECUTE_IF("delete_crash", log_buffer_flush_to_disk();
4581-
DBUG_SUICIDE(););
4582-
45834577
/* Even if we got killed shortly after deleting the
45844578
tablespace file, the record must have already been
45854579
written to the redo log. */

0 commit comments

Comments
 (0)