MDEV-23422 innodb_zip.restart fails with extra #sql-ib*.ibd

The background DROP TABLE queue may be blocked for some more time
due to MDEV-16678. Let us apply similar adjustments as earlier:
commit 6af00b2cc620a96372541447cca7134f2d051b19
commit 89633995e4962a7ad4a241cdf62ee637990d6787
commit ccd87d34a404fba3431dd7ef09f8a98a5874040f

1 files changed, 74 insertions, 18 deletions

diff --git a/mysql-test/suite/innodb_zip/t/restart.test b/mysql-test/suite/innodb_zip/t/restart.test
index e0e42a682ab..6a0e60f3ce6 100644
--- a/mysql-test/suite/innodb_zip/t/restart.test
+++ b/mysql-test/suite/innodb_zip/t/restart.test
@@ -163,14 +163,22 @@ SELECT count(*) FROM t7_restart;
 --echo #
 --source include/shutdown_mysqld.inc
 
+--let $regexp=/#sql-ib[0-9a-f]+\.ibd\n//
+
 --echo ---- MYSQL_DATA_DIR/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_DATA_DIR/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_DATA_DIR/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/alt_dir
 --list_files $MYSQL_TMP_DIR/alt_dir
 --echo ---- MYSQL_TMP_DIR/alt_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/alt_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/alt_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 
 --echo #
 --echo # Start the server and show that tables are still visible and accessible.
@@ -255,11 +263,17 @@ SHOW CREATE TABLE t7_restart;
 --copy_file $MYSQL_DATA_DIR/test/t5_restart.frm $MYSQL_DATA_DIR/test/t5_restart.frm.bak
 
 --echo ---- MYSQL_DATA_DIR/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_DATA_DIR/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_DATA_DIR/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/alt_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/alt_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/alt_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 
 --echo #
 --echo # Start the server and show the tablespaces.
@@ -306,11 +320,17 @@ RENAME TABLE t5_restart TO t55_restart;
 --remove_file $MYSQL_TMP_DIR/alt_dir/test/t5_restart.ibd.bak
 
 --echo ---- MYSQL_DATA_DIR/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_DATA_DIR/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_DATA_DIR/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/alt_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/alt_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/alt_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 
 --echo #
 --echo # Rename file table and tablespace
@@ -338,11 +358,17 @@ SELECT count(*) FROM t77_restart;
 SHOW CREATE TABLE t77_restart;
 
 --echo ---- MYSQL_DATA_DIR/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_DATA_DIR/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_DATA_DIR/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/alt_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/alt_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/alt_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 
 --echo #
 --echo # Restart the server
@@ -378,14 +404,23 @@ SHOW CREATE TABLE t77_restart;
 --mkdir $MYSQL_TMP_DIR/new_dir
 --mkdir $MYSQL_TMP_DIR/new_dir/test
 --echo ---- MYSQL_DATA_DIR/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_DATA_DIR/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_DATA_DIR/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/alt_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/alt_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/alt_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/new_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/new_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/new_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 
 --echo # Moving tablespace 't4_restart' from MYSQL_DATA_DIR to MYSQL_TMP_DIR/new_dir
 --copy_file $MYSQL_DATA_DIR/test/t4_restart.ibd $MYSQL_TMP_DIR/new_dir/test/t4_restart.ibd
@@ -431,14 +466,23 @@ SHOW CREATE TABLE t77_restart;
 --exec echo $MYSQL_TMP_DIR/new_dir/test/t77_restart#P#p1#SP#s3.ibd > $MYSQL_DATA_DIR/test/t77_restart#P#p1#SP#s3.isl
 
 --echo ---- MYSQL_DATA_DIR/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_DATA_DIR/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_DATA_DIR/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/alt_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/alt_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/alt_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/new_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/new_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/new_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 
 --echo #
 --echo # Start the server and check tablespaces.
@@ -478,11 +522,17 @@ SHOW CREATE TABLE t77_restart;
 --echo #
 
 --echo ---- MYSQL_DATA_DIR/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_DATA_DIR/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_DATA_DIR/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/new_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/new_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/new_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 
 --echo # Moving 't4_restart' from MYSQL_TMP_DIR/new_dir to MYSQL_DATA_DIR
 --copy_file $MYSQL_TMP_DIR/new_dir/test/t4_restart.ibd $MYSQL_DATA_DIR/test/t4_restart.ibd
@@ -520,11 +570,17 @@ SHOW CREATE TABLE t77_restart;
 --remove_file $MYSQL_DATA_DIR/test/t77_restart#P#p1#SP#s3.isl
 
 --echo ---- MYSQL_DATA_DIR/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_DATA_DIR/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_DATA_DIR/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 --echo ---- MYSQL_TMP_DIR/new_dir/test
+--list_files_write_file $MYSQLD_DATADIR.files.txt $MYSQL_TMP_DIR/new_dir/test
+--replace_regex $regexp
 --replace_result #P# #p#  #SP# #sp#
---list_files $MYSQL_TMP_DIR/new_dir/test
+--cat_file $MYSQLD_DATADIR.files.txt
+--remove_file $MYSQLD_DATADIR.files.txt
 
 --echo #
 --echo # Start the server and check tablespaces.