MDEV-37669 innodb.sys_defragment fails with wrong result

- Fixing the sporadic innodb.sys_defragment,
innodb.sys_defragment_fail test case by comparing the
file_size

Author: Thirunarayanan

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

@@ -12,14 +12,12 @@ CREATE TABLE t2(f1 INT NOT NULL PRIMARY KEY,f2 VARCHAR(40))ENGINE=InnoDB PARTITI
 INSERT INTO t1 SELECT seq, seq, seq FROM seq_1_to_16384;
 DROP TABLE t2, t1;
 InnoDB		0 transactions not purged
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
-name	file_size
-innodb_system	205520896
 set GLOBAL innodb_fast_shutdown= 0;
 # restart
 FOUND 1 /InnoDB: Moving the data from extents 4096 through 22016/ in mysqld.1.err
 FOUND 1 /InnoDB: Defragmentation of system tablespace is successful/ in mysqld.1.err
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
-name	file_size
-innodb_system	14680064
+select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
+name	shrunk
+innodb_system	1
 # restart

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

@@ -20,33 +20,35 @@ InnoDB		0 transactions not purged
 FOUND 1 /InnoDB: User table exists in the system tablespace/ in mysqld.1.err
 DROP TABLE t1;
 InnoDB		0 transactions not purged
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
-name	file_size
-innodb_system	58720256
 # restart: --debug_dbug=+d,fail_after_level_defragment
 FOUND 1 /InnoDB: Defragmentation of CLUST_IND in SYS_COLUMNS failed./ in mysqld.1.err
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
-name	file_size
-innodb_system	58720256
+select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
+name	shrunk
+innodb_system	0
 # restart: --debug_dbug=d,allocation_prepare_fail
 FOUND 1 /InnoDB: Defragmentation of CLUST_IND in SYS_INDEXES failed./ in mysqld.1.err
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
-name	file_size
-innodb_system	58720256
+select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
+name	shrunk
+innodb_system	0
 # restart: --debug_dbug=d,relation_page_prepare_fail
 FOUND 2 /InnoDB: Defragmentation of CLUST_IND in SYS_INDEXES failed./ in mysqld.1.err
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
-name	file_size
-innodb_system	58720256
+select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
+name	shrunk
+innodb_system	0
 # restart: --debug_dbug=d,remover_prepare_fail
 FOUND 3 /InnoDB: Defragmentation of CLUST_IND in SYS_INDEXES failed./ in mysqld.1.err
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
-name	file_size
-innodb_system	58720256
+select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
+name	shrunk
+innodb_system	0
 # restart
 FOUND 5 /InnoDB: Moving the data from extents 4096 through 8960/ in mysqld.1.err
 FOUND 1 /InnoDB: Defragmentation of system tablespace is successful/ in mysqld.1.err
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
-name	file_size
-innodb_system	15728640
+select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
+name	shrunk
+innodb_system	1
 # restart

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

@@ -18,7 +18,7 @@ INSERT INTO t1 SELECT seq, seq, seq FROM seq_1_to_16384;
 DROP TABLE t2, t1;
 --source include/wait_all_purged.inc
 
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
+let $fsize=`select file_size from information_schema.innodb_sys_tablespaces where space = 0`;
 
 set GLOBAL innodb_fast_shutdown= 0;
 --source include/restart_mysqld.inc
@@ -30,7 +30,8 @@ let SEARCH_PATTERN=InnoDB: Moving the data from extents 4096 through 22016;
 let SEARCH_PATTERN=InnoDB: Defragmentation of system tablespace is successful;
 --source include/search_pattern_in_file.inc
 
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
+evalp select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
 
 --source include/shutdown_mysqld.inc
 

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

@@ -34,7 +34,7 @@ let SEARCH_PATTERN=InnoDB: User table exists in the system tablespace;
 DROP TABLE t1;
 
 --source include/wait_all_purged.inc
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
+let $fsize=`select file_size from information_schema.innodb_sys_tablespaces where space = 0`;
 
 let $restart_parameters=--debug_dbug=+d,fail_after_level_defragment;
 --source include/restart_mysqld.inc
@@ -43,7 +43,8 @@ let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
 let SEARCH_PATTERN=InnoDB: Defragmentation of CLUST_IND in SYS_COLUMNS failed.;
 --source include/search_pattern_in_file.inc
 
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
+evalp select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
 
 let $restart_parameters=--debug_dbug=d,allocation_prepare_fail;
 --source include/restart_mysqld.inc
@@ -52,7 +53,8 @@ let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
 let SEARCH_PATTERN=InnoDB: Defragmentation of CLUST_IND in SYS_INDEXES failed.;
 --source include/search_pattern_in_file.inc
 
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
+evalp select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
 
 let $restart_parameters=--debug_dbug=d,relation_page_prepare_fail;
 --source include/restart_mysqld.inc
@@ -61,7 +63,8 @@ let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
 let SEARCH_PATTERN=InnoDB: Defragmentation of CLUST_IND in SYS_INDEXES failed.;
 --source include/search_pattern_in_file.inc
 
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
+evalp select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
 
 let $restart_parameters=--debug_dbug=d,remover_prepare_fail;
 --source include/restart_mysqld.inc
@@ -70,7 +73,8 @@ let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
 let SEARCH_PATTERN=InnoDB: Defragmentation of CLUST_IND in SYS_INDEXES failed.;
 --source include/search_pattern_in_file.inc
 
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
+evalp select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
 
 let $restart_parameters=;
 --source include/restart_mysqld.inc
@@ -82,7 +86,8 @@ let SEARCH_PATTERN= InnoDB: Moving the data from extents 4096 through 8960;
 let SEARCH_PATTERN=InnoDB: Defragmentation of system tablespace is successful;
 --source include/search_pattern_in_file.inc
 
-select name, file_size from information_schema.innodb_sys_tablespaces where space = 0;
+evalp select name, file_size<$fsize shrunk
+from information_schema.innodb_sys_tablespaces where space=0;
 
 --source include/shutdown_mysqld.inc
 --move_file $MYSQLD_DATADIR/ibdata1_copy $MYSQLD_DATADIR/ibdata1