database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-21679 fixup for s390x

Browse Source 
Some s390x environments include
https://github.com/madler/zlib/pull/410
and a more pessimistic compressBound: (sourceLen * 16 + 2308) / 8 + 6.
Let us adjust the recently enabled tests accordingly.
This commit is contained in:
Marko Mäkelä
2023-09-11 12:32:44 +03:00
parent 384eb570a6
commit ef569c324d
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result
View File

@@ -105,7 +105,7 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
show warnings; show warnings;
Level Code Message 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 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; show warnings;
Level Code Message Level Code Message
create index idx5 on worklog5743_1(a1, a2(430)); create index idx5 on worklog5743_1(a1, a2(430));
@@ -113,7 +113,7 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
show warnings; show warnings;
Level Code Message 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 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; show warnings;
Level Code Message Level Code Message
SET sql_mode= ''; SET sql_mode= '';

8
mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result
View File

@@ -109,7 +109,7 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
show warnings; show warnings;
Level Code Message 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 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; show warnings;
Level Code Message Level Code Message
create index idx5 on worklog5743_1(a1, a2(430)); create index idx5 on worklog5743_1(a1, a2(430));
@@ -117,7 +117,7 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
show warnings; show warnings;
Level Code Message 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 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; show warnings;
Level Code Message Level Code Message
create index idx2 on worklog5743_2(a2(4000)); create index idx2 on worklog5743_2(a2(4000));
@@ -131,7 +131,7 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
show warnings; show warnings;
Level Code Message 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 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; show warnings;
Level Code Message Level Code Message
create index idx5 on worklog5743_2(a1, a2(942)); create index idx5 on worklog5743_2(a1, a2(942));
@@ -139,7 +139,7 @@ ERROR 42000: Row size too large. The maximum row size for the used table type, n
show warnings; show warnings;
Level Code Message 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 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; show warnings;
Level Code Message Level Code Message
create index idx3 on worklog5743_4(a2(1537)); create index idx3 on worklog5743_4(a2(1537));

8
mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test
View File

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

16
mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test
View File

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