MDEV-21679 fixup for s390x

Some s390x environments include
madler/zlib#410
and a more pessimistic compressBound: (sourceLen * 16 + 2308) / 8 + 6.
Let us adjust the recently enabled tests accordingly.

mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result

@@ -105,15 +105,15 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
 show warnings;
 Level	Code	Message
 Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-create index idx4 on worklog5743_1(a2(434));
+create index idx4 on worklog5743_1(a2(290));
 show warnings;
 Level	Code	Message
 create index idx5 on worklog5743_1(a1, a2(430));
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 show warnings;
 Level	Code	Message
 Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-create index idx6 on worklog5743_1(a1, a2(428));
+create index idx6 on worklog5743_1(a1, a2(283));
 show warnings;
 Level	Code	Message
 SET sql_mode= '';

mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result

@@ -109,15 +109,15 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
 show warnings;
 Level	Code	Message
 Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-create index idx4 on worklog5743_1(a2(434));
+create index idx4 on worklog5743_1(a2(290));
 show warnings;
 Level	Code	Message
 create index idx5 on worklog5743_1(a1, a2(430));
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 show warnings;
 Level	Code	Message
 Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-create index idx6 on worklog5743_1(a1, a2(428));
+create index idx6 on worklog5743_1(a1, a2(283));
 show warnings;
 Level	Code	Message
 create index idx2 on worklog5743_2(a2(4000));
@@ -131,15 +131,15 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
 show warnings;
 Level	Code	Message
 Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-create index idx4 on worklog5743_2(a2(946));
+create index idx4 on worklog5743_2(a2(802));
 show warnings;
 Level	Code	Message
 create index idx5 on worklog5743_2(a1, a2(942));
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 show warnings;
 Level	Code	Message
 Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-create index idx6 on worklog5743_2(a1, a2(940));
+create index idx6 on worklog5743_2(a1, a2(795));
 show warnings;
 Level	Code	Message
 create index idx3 on worklog5743_4(a2(1537));

mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test

@@ -142,14 +142,14 @@ show warnings;
 -- error ER_TOO_BIG_ROWSIZE
 create index idx3 on worklog5743_1(a2(436));
 show warnings;
-# Bug#13391353 Limit is one byte less on on 32bit-Linux only
-create index idx4 on worklog5743_1(a2(434));
+# MDEV-27634 innodb_zip tests failing on s390x
+create index idx4 on worklog5743_1(a2(290));
 show warnings;
 -- error ER_TOO_BIG_ROWSIZE
 create index idx5 on worklog5743_1(a1, a2(430));
 show warnings;
-# Bug#13391353 Limit is one byte less on on 32bit-Linux only
-create index idx6 on worklog5743_1(a1, a2(428));
+# MDEV-27634 innodb_zip tests failing on s390x
+create index idx6 on worklog5743_1(a1, a2(283));
 show warnings;
 
 # Test edge cases for indexes using key_block_size=2

mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test

@@ -144,14 +144,14 @@ show warnings;
 -- error ER_TOO_BIG_ROWSIZE
 create index idx3 on worklog5743_1(a2(436));
 show warnings;
-# Bug#13391353 Limit is one byte less on on 32bit-Linux only
-create index idx4 on worklog5743_1(a2(434));
+# MDEV-27634 innodb_zip tests failing on s390x
+create index idx4 on worklog5743_1(a2(290));
 show warnings;
 -- error ER_TOO_BIG_ROWSIZE
 create index idx5 on worklog5743_1(a1, a2(430));
 show warnings;
-# Bug#13391353 Limit is one byte less on on 32bit-Linux only
-create index idx6 on worklog5743_1(a1, a2(428));
+# MDEV-27634 innodb_zip tests failing on s390x
+create index idx6 on worklog5743_1(a1, a2(283));
 show warnings;
 
 # Test edge cases for indexes using key_block_size=2
@@ -161,14 +161,14 @@ show warnings;
 -- error ER_TOO_BIG_ROWSIZE
 create index idx3 on worklog5743_2(a2(948));
 show warnings;
-# Bug#13391353 Limit is one byte less on on 32bit-Linux only
-create index idx4 on worklog5743_2(a2(946));
+# MDEV-27634 innodb_zip tests failing on s390x
+create index idx4 on worklog5743_2(a2(802));
 show warnings;
 -- error ER_TOO_BIG_ROWSIZE
 create index idx5 on worklog5743_2(a1, a2(942));
 show warnings;
-# Bug#13391353 Limit is one byte less on on 32bit-Linux only
-create index idx6 on worklog5743_2(a1, a2(940));
+# MDEV-27634 innodb_zip tests failing on s390x
+create index idx6 on worklog5743_2(a1, a2(795));
 show warnings;
 
 # Test edge cases for indexes using key_block_size=4