Skip to content

Commit

Permalink
PS-9293, PS-9328: Revert of fix for PS-7666: Assertion failure: fil0f…
Browse files Browse the repository at this point in the history
…il.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.
  • Loading branch information
dlenev committed Sep 5, 2024
1 parent 646a7cf commit 8c239ed
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 61 deletions.
23 changes: 0 additions & 23 deletions mysql-test/suite/innodb/r/drop_table_crash_debug.result

This file was deleted.

32 changes: 0 additions & 32 deletions mysql-test/suite/innodb/t/drop_table_crash_debug.test

This file was deleted.

6 changes: 0 additions & 6 deletions storage/innobase/fil/fil0fil.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3207,10 +3207,7 @@ static bool fil_space_free(space_id_t space_id, bool x_latched) {
rw_lock_x_unlock(&space->latch);
}

shard->mutex_acquire();
Fil_shard::space_free_low(space);
shard->mutex_release();

ut_a(space == nullptr);

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

mtr.commit();

DBUG_EXECUTE_IF("delete_crash", log_buffer_flush_to_disk();
DBUG_SUICIDE(););

/* Even if we got killed shortly after deleting the
tablespace file, the record must have already been
written to the redo log. */
Expand Down

0 comments on commit 8c239ed

Please sign in to comment.