MDEV-7184 main.key_cache fails in buildbot on Windows 32bit

change the test not to use absolute values of Key_blocks_unused.

2 files changed, 40 insertions, 36 deletions

diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result
index 8634beb290f..1146ae8bbfa 100644
--- a/mysql-test/r/key_cache.result
+++ b/mysql-test/r/key_cache.result
@@ -435,16 +435,16 @@ p	i	a
 4	3	zzzz
 update t1 set p=3 where p=1;
 update t2 set i=2 where i=1;
-show status like 'key_%';
-Variable_name	Value
-Key_blocks_not_flushed	0
-Key_blocks_unused	KEY_BLOCKS_UNUSED
-Key_blocks_used	4
-Key_blocks_warm	0
-Key_read_requests	22
-Key_reads	0
-Key_write_requests	26
-Key_writes	6
+select * from information_schema.session_status where variable_name like 'key_%' and variable_name != 'Key_blocks_unused';
+VARIABLE_NAME	VARIABLE_VALUE
+KEY_BLOCKS_NOT_FLUSHED	0
+KEY_BLOCKS_USED	4
+KEY_BLOCKS_WARM	0
+KEY_READ_REQUESTS	22
+KEY_READS	0
+KEY_WRITE_REQUESTS	26
+KEY_WRITES	6
+select variable_value into @key_blocks_unused from information_schema.session_status where variable_name = 'Key_blocks_unused';
 select * from information_schema.key_caches where segment_number is null;
 KEY_CACHE_NAME	SEGMENTS	SEGMENT_NUMBER	FULL_SIZE	BLOCK_SIZE	USED_BLOCKS	UNUSED_BLOCKS	DIRTY_BLOCKS	READ_REQUESTS	READS	WRITE_REQUESTS	WRITES
 default	NULL	NULL	2097152	1024	4	#	0	22	0	26	6
@@ -483,16 +483,18 @@ p	i	a
 4	3	zzzz
 update t1 set p=3 where p=1;
 update t2 set i=2 where i=1;
-show status like 'key_%';
-Variable_name	Value
-Key_blocks_not_flushed	0
-Key_blocks_unused	KEY_BLOCKS_UNUSED
-Key_blocks_used	4
-Key_blocks_warm	0
-Key_read_requests	22
-Key_reads	0
-Key_write_requests	26
-Key_writes	6
+select * from information_schema.session_status where variable_name like 'key_%' and variable_name != 'Key_blocks_unused';
+VARIABLE_NAME	VARIABLE_VALUE
+KEY_BLOCKS_NOT_FLUSHED	0
+KEY_BLOCKS_USED	4
+KEY_BLOCKS_WARM	0
+KEY_READ_REQUESTS	22
+KEY_READS	0
+KEY_WRITE_REQUESTS	26
+KEY_WRITES	6
+select variable_value < @key_blocks_unused from information_schema.session_status where variable_name = 'Key_blocks_unused';
+variable_value < @key_blocks_unused
+1
 select * from information_schema.key_caches where segment_number is null;
 KEY_CACHE_NAME	SEGMENTS	SEGMENT_NUMBER	FULL_SIZE	BLOCK_SIZE	USED_BLOCKS	UNUSED_BLOCKS	DIRTY_BLOCKS	READ_REQUESTS	READS	WRITE_REQUESTS	WRITES
 default	2	NULL	2097152	1024	4	#	0	22	0	26	6
@@ -526,16 +528,18 @@ p	i	a
 4	3	zzzz
 update t1 set p=3 where p=1;
 update t2 set i=2 where i=1;
-show status like 'key_%';
-Variable_name	Value
-Key_blocks_not_flushed	0
-Key_blocks_unused	KEY_BLOCKS_UNUSED
-Key_blocks_used	4
-Key_blocks_warm	0
-Key_read_requests	22
-Key_reads	0
-Key_write_requests	26
-Key_writes	6
+select * from information_schema.session_status where variable_name like 'key_%' and variable_name != 'Key_blocks_unused';
+VARIABLE_NAME	VARIABLE_VALUE
+KEY_BLOCKS_NOT_FLUSHED	0
+KEY_BLOCKS_USED	4
+KEY_BLOCKS_WARM	0
+KEY_READ_REQUESTS	22
+KEY_READS	0
+KEY_WRITE_REQUESTS	26
+KEY_WRITES	6
+select variable_value = @key_blocks_unused from information_schema.session_status where variable_name = 'Key_blocks_unused';
+variable_value = @key_blocks_unused
+1
 select * from information_schema.key_caches where segment_number is null;
 KEY_CACHE_NAME	SEGMENTS	SEGMENT_NUMBER	FULL_SIZE	BLOCK_SIZE	USED_BLOCKS	UNUSED_BLOCKS	DIRTY_BLOCKS	READ_REQUESTS	READS	WRITE_REQUESTS	WRITES
 default	1	NULL	2097152	1024	4	#	0	22	0	26	6
diff --git a/mysql-test/t/key_cache.test b/mysql-test/t/key_cache.test
index 86e56a8301b..d28e7c23a4c 100644
--- a/mysql-test/t/key_cache.test
+++ b/mysql-test/t/key_cache.test
@@ -301,8 +301,8 @@ select * from t2;
 update t1 set p=3 where p=1;
 update t2 set i=2 where i=1;
 
---replace_result 1804 KEY_BLOCKS_UNUSED 1801 KEY_BLOCKS_UNUSED 1663 KEY_BLOCKS_UNUSED 1782 KEY_BLOCKS_UNUSED
-show status like 'key_%';
+select * from information_schema.session_status where variable_name like 'key_%' and variable_name != 'Key_blocks_unused';
+select variable_value into @key_blocks_unused from information_schema.session_status where variable_name = 'Key_blocks_unused';
 --replace_column 7 #
 select * from information_schema.key_caches where segment_number is null;
 
@@ -334,8 +334,8 @@ update t1 set p=3 where p=1;
 update t2 set i=2 where i=1;
 
 
---replace_result 1800 KEY_BLOCKS_UNUSED 1794 KEY_BLOCKS_UNUSED 1656 KEY_BLOCKS_UNUSED 1775 KEY_BLOCKS_UNUSED
-show status like 'key_%';
+select * from information_schema.session_status where variable_name like 'key_%' and variable_name != 'Key_blocks_unused';
+select variable_value < @key_blocks_unused from information_schema.session_status where variable_name = 'Key_blocks_unused';
 --replace_column 7 #
 select * from information_schema.key_caches where segment_number is null;
 
@@ -359,8 +359,8 @@ select * from t2;
 update t1 set p=3 where p=1;
 update t2 set i=2 where i=1;
 
---replace_result 1804 KEY_BLOCKS_UNUSED 1801 KEY_BLOCKS_UNUSED 1663 KEY_BLOCKS_UNUSED 1782 KEY_BLOCKS_UNUSED
-show status like 'key_%';
+select * from information_schema.session_status where variable_name like 'key_%' and variable_name != 'Key_blocks_unused';
+select variable_value = @key_blocks_unused from information_schema.session_status where variable_name = 'Key_blocks_unused';
 --replace_column 7 #
 select * from information_schema.key_caches where segment_number is null;