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.

5 files changed, 12 insertions, 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
new file mode 100644
index 00000000000..cd9a004a686
--- /dev/null
+++ 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/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_64.result b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result
index c86331a8a1c..c86331a8a1c 100644
--- a/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_64.result
+++ b/mysql-test/suite/sys_vars/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
deleted file mode 100644
index b3bec1eecdd..00000000000
--- a/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_32.result
+++ /dev/null
@@ -1,7 +0,0 @@
-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
-4294967295
-set global innodb_ft_result_cache_limit=2000000000;
diff --git a/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_32.test b/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit.test
index d9defc7447b..b1ad2cd3821 100644
--- a/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_32.test
+++ b/mysql-test/suite/sys_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
deleted file mode 100644
index 2606d2b5ca8..00000000000
--- a/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_64bit.inc
---source include/have_innodb.inc
-
-let $innodb_ft_result_cache_limit_orig=`select @@innodb_ft_result_cache_limit`;
-
-set global innodb_ft_result_cache_limit=5000000000;
-select @@innodb_ft_result_cache_limit;
-
-eval set global innodb_ft_result_cache_limit=$innodb_ft_result_cache_limit_orig;