When MDEV-19514 removed the change buffer merges in the background, it introduced a minor regression: After DDL operations that drop or rebuild a table, any entries in the change buffer could survive until a slow shutdown innodb_fast_shutdown=0 is executed.

We can do better: Before returning from fil_delete_tablespace(), invoke ibuf_delete_for_discarded_space(). In that way, the only way to have change buffer ‘leaks’ is to kill the server and never initiate a slow shutdown.