MDEV-19387 innodb_ft_result_cache_limit_32 fails on s390x

Fix: ==== 1) Combined innodb_ft_result_cache_limit_32.test and innodb_ft_result_cache_limit_64.test test case in sys_vars suite. 2) Use word_size.inc for combinations of innodb_ft_result_cache_limit test case.
MariaDB · May 8, 2019 · 7b93d71 · 7b93d71
1 parent db9622f
commit 7b93d71
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff
@@ -0,0 +1,11 @@
+--- mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result	2019-05-07 15:09:57.220599318 +0530
++++ mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.reject	2019-05-07 15:10:20.012718538 +0530
+@@ -1,5 +1,7 @@
+ set global innodb_ft_result_cache_limit=5000000000;
++Warnings:
++Warning	1292	Truncated incorrect innodb_ft_result_cache_limit value: '5000000000'
+ select @@innodb_ft_result_cache_limit;
+ @@innodb_ft_result_cache_limit
+-5000000000
++4294967295
+ set global innodb_ft_result_cache_limit=2000000000;
diff --git a/.../r/innodb_ft_result_cache_limit_64.result → ...ars/r/innodb_ft_result_cache_limit.result b/.../r/innodb_ft_result_cache_limit_64.result → ...ars/r/innodb_ft_result_cache_limit.result
diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_32.result b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_32.result
diff --git a/...rs/t/innodb_ft_result_cache_limit_32.test → ..._vars/t/innodb_ft_result_cache_limit.test b/...rs/t/innodb_ft_result_cache_limit_32.test → ..._vars/t/innodb_ft_result_cache_limit.test
@@ -1,4 +1,4 @@
---source include/have_32bit.inc
+--source include/word_size.inc
 --source include/have_innodb.inc
 
 let $innodb_ft_result_cache_limit_orig=`select @@innodb_ft_result_cache_limit`;

diff --git a/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_64.test b/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_64.test