Merge 10.3 into 10.4

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

@@ -1,4 +0,0 @@
-set @file_per_table=@@global.innodb_file_per_table;
-SET GLOBAL innodb_file_per_table=on;
-SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
-SET GLOBAL innodb_file_per_table=@file_per_table;

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

@@ -1,5 +1,3 @@
-SET GLOBAL innodb_file_per_table=on;
-SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
 CREATE TABLE bug52745 (
 a2 int(10) unsigned DEFAULT NULL,
 col37 time DEFAULT NULL,
@@ -37,29 +35,8 @@ col68 tinyblob,
 col69 date DEFAULT NULL,
 col70 tinyint(3) unsigned zerofill DEFAULT NULL,
 col71 varchar(44) CHARACTER SET utf8 DEFAULT NULL,
-col72 datetime DEFAULT NULL,
-col73 smallint(5) unsigned zerofill DEFAULT NULL,
-col74 longblob,
-col75 bit(34) DEFAULT NULL,
-col76 float unsigned zerofill DEFAULT NULL,
-col77 year(4) DEFAULT NULL,
-col78 tinyint(3) unsigned DEFAULT NULL,
-col79 set('msfheowh','tbpxbgf','by','wahnrjw','myqfasxz','rsokyumrt') CHARACTER SET latin2 DEFAULT NULL,
-col80 datetime DEFAULT NULL,
-col81 smallint(6) DEFAULT NULL,
-col82 enum('xtaurnqfqz','rifrse','kuzwpbvb','niisabk','zxavro','rbvasv','','uulrfaove','','') DEFAULT NULL,
-col83 bigint(20) unsigned zerofill DEFAULT NULL,
-col84 float unsigned zerofill DEFAULT NULL,
-col85 double DEFAULT NULL,
-col86 enum('ylannv','','vlkhycqc','snke','cxifustp','xiaxaswzp','oxl') CHARACTER SET latin1 COLLATE latin1_german2_ci DEFAULT NULL,
-col87 varbinary(221) DEFAULT NULL,
-col88 double unsigned DEFAULT NULL,
-col89 float unsigned zerofill DEFAULT NULL,
-col90 tinyblob
+col72 datetime DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-Warnings:
-Note	1291	Column 'col82' has duplicated value '' in ENUM
-Note	1291	Column 'col82' has duplicated value '' in ENUM
 SET sql_mode = default;
 INSERT IGNORE INTO bug52745 SET
 col40='0000-00-00 00:00:00',
@@ -81,21 +58,7 @@ col66='19600719080256',
 col68=repeat('Sagittarius\'',54),
 col69='38943902',
 col70=1232,
-col71='Elora\'',
-col74=repeat('zipp',11),
-col75='0',
-col76=23254,
-col78=13247,
-col79='56219',
-col80='20500609035724',
-col81=11632,
-col82=7,
-col84=-23863,
-col85=6341,
-col87='HZdkf.4 s7t,5Rmq	8so fmr,ruGLUG25TrtI.yQ	2SuHq0ML7rw7.4 b2yf2E5TJxOtBBZImezDnzpj,uPYfznnEUDN1e9aQoO 2DsplB7TFWy	oQJ br  HLF :F,eQ p4i1oWsr lL3PG,hjCz6hYqN h1QTjLCjrv:QCdSzpYBibJAtZCxLOk3l6Blsh.W',
-col88=16894,
-col89=6161,
-col90=repeat('gale',48);
+col71='Elora\'';
 Warnings:
 Warning	1265	Data truncated for column 'col53' at row 1
 Warning	1264	Out of range value for column 'col54' at row 1
@@ -107,9 +70,6 @@ Warning	1264	Out of range value for column 'col66' at row 1
 Warning	1265	Data truncated for column 'col68' at row 1
 Warning	1265	Data truncated for column 'col69' at row 1
 Warning	1264	Out of range value for column 'col70' at row 1
-Warning	1264	Out of range value for column 'col78' at row 1
-Warning	1265	Data truncated for column 'col79' at row 1
-Warning	1264	Out of range value for column 'col84' at row 1
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1265	Data truncated for column 'col53' at row 1
@@ -122,8 +82,4 @@ Warning	1264	Out of range value for column 'col66' at row 1
 Warning	1265	Data truncated for column 'col68' at row 1
 Warning	1265	Data truncated for column 'col69' at row 1
 Warning	1264	Out of range value for column 'col70' at row 1
-Warning	1264	Out of range value for column 'col78' at row 1
-Warning	1265	Data truncated for column 'col79' at row 1
-Warning	1264	Out of range value for column 'col84' at row 1
 DROP TABLE bug52745;
-SET GLOBAL innodb_file_per_table=1;

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

@@ -105,7 +105,7 @@ 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 8126. 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));
@@ -113,7 +113,7 @@ 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 8126. 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));
@@ -127,7 +127,7 @@ 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 8126. 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));
@@ -135,7 +135,7 @@ 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 8126. 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 idx2 on worklog5743_4(a2(4000));
@@ -149,7 +149,7 @@ 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 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-create index idx4 on worklog5743_4(a2(1970));
+create index idx4 on worklog5743_4(a2(1826));
 show warnings;
 Level	Code	Message
 create index idx5 on worklog5743_4(a1, a2(1966));
@@ -157,7 +157,7 @@ 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 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-create index idx6 on worklog5743_4(a1, a2(1964));
+create index idx6 on worklog5743_4(a1, a2(1819));
 show warnings;
 Level	Code	Message
 create index idx2 on worklog5743_8(a2(3073));

mysql-test/suite/innodb_zip/r/page_size,4k.rdiff

@@ -1,5 +1,3 @@
---- page_size.result
-+++ page_size,4k.result
 @@ -3,7 +3,7 @@
  SELECT variable_value FROM information_schema.global_status
  WHERE LOWER(variable_name) = 'innodb_page_size';
@@ -85,8 +83,8 @@
 -c21 char(200), c22 char(200), c23 char(200), c24 char(200), c25 char(200),
 -c26 char(200), c27 char(200), c28 char(200), c29 char(200), c30 char(200),
 -c31 char(200), c32 char(200), c33 char(200), c34 char(200), c35 char(200),
--c36 char(200), c37 char(200), c38 char(200), c39 char(200), c40 char(157)
-+c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(76)
+-c36 char(200), c37 char(200), c38 char(196)
++c06 char(200), c07 char(200), c08 char(176)
  ) ROW_FORMAT=compressed;
  DROP TABLE t1;
  CREATE TABLE t1 (
@@ -465,5 +463,5 @@
 -Warning	139	Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
 +Warning	139	Row size too large (> 1982). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
  DROP TABLE t1;
- CREATE TABLE t1(c text, PRIMARY KEY (c(438)))
+ CREATE TABLE t1(c text, PRIMARY KEY (c(293)))
  ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;

mysql-test/suite/innodb_zip/r/page_size,8k.rdiff

@@ -1,5 +1,3 @@
---- page_size.result
-+++ page_size,8k.result
 @@ -3,7 +3,7 @@
  SELECT variable_value FROM information_schema.global_status
  WHERE LOWER(variable_name) = 'innodb_page_size';
@@ -83,8 +81,8 @@
 -c21 char(200), c22 char(200), c23 char(200), c24 char(200), c25 char(200),
 -c26 char(200), c27 char(200), c28 char(200), c29 char(200), c30 char(200),
 -c31 char(200), c32 char(200), c33 char(200), c34 char(200), c35 char(200),
--c36 char(200), c37 char(200), c38 char(200), c39 char(200), c40 char(157)
-+c16 char(200), c17 char(200), c18 char(200), c19 char(200), c20 char(103)
+-c36 char(200), c37 char(200), c38 char(196)
++c16 char(200), c17 char(200), c18 char(182)
  ) ROW_FORMAT=compressed;
  DROP TABLE t1;
  CREATE TABLE t1 (
@@ -411,5 +409,5 @@
 -Warning	139	Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
 +Warning	139	Row size too large (> 4030). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
  DROP TABLE t1;
- CREATE TABLE t1(c text, PRIMARY KEY (c(438)))
+ CREATE TABLE t1(c text, PRIMARY KEY (c(293)))
  ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;

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

@@ -101,7 +101,7 @@ c16 char(200), c17 char(200), c18 char(200), c19 char(200), c20 char(200),
 c21 char(200), c22 char(200), c23 char(200), c24 char(200), c25 char(200),
 c26 char(200), c27 char(200), c28 char(200), c29 char(200), c30 char(200),
 c31 char(200), c32 char(200), c33 char(200), c34 char(200), c35 char(200),
-c36 char(200), c37 char(200), c38 char(200), c39 char(200), c40 char(157)
+c36 char(200), c37 char(200), c38 char(196)
 ) ROW_FORMAT=compressed;
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -591,7 +591,7 @@ ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 Warnings:
 Warning	139	Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
 DROP TABLE t1;
-CREATE TABLE t1(c text, PRIMARY KEY (c(438)))
+CREATE TABLE t1(c text, PRIMARY KEY (c(293)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
 DROP TABLE t1;

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

@@ -324,7 +324,7 @@ col_1_binary = REPEAT("c", 255)
 DROP TABLE worklog5743;
 CREATE TABLE worklog5743_key2 (
 col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(948))
+PRIMARY KEY (col_1_varchar(801))
 ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
 INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
@@ -348,7 +348,7 @@ col_1_varchar = REPEAT("c", 4000)
 DROP TABLE worklog5743_key2;
 CREATE TABLE worklog5743_key4 (
 col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(1964))
+PRIMARY KEY (col_1_varchar(1825))
 ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
 INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
@@ -397,7 +397,7 @@ col_1_varchar = REPEAT("c", 4000)
 DROP TABLE worklog5743_key8;
 CREATE TABLE worklog5743_key2 (
 col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(948))
+PRIMARY KEY (col_1_text(801))
 ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
 INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
@@ -421,7 +421,7 @@ col_1_text = REPEAT("c", 4000)
 DROP TABLE worklog5743_key2;
 CREATE TABLE worklog5743_key4 (
 col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(1964))
+PRIMARY KEY (col_1_text(1825))
 ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
 INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
@@ -469,7 +469,7 @@ col_1_text = REPEAT("c", 4000)
 DROP TABLE worklog5743_key8;
 CREATE TABLE worklog5743_key2 (
 col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(948))
+PRIMARY KEY (col_1_blob(801))
 ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
 INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
@@ -493,7 +493,7 @@ col_1_blob = REPEAT("c", 4000)
 DROP TABLE worklog5743_key2;
 CREATE TABLE worklog5743_key4 (
 col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(1964))
+PRIMARY KEY (col_1_blob(1825))
 ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
 INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
@@ -1305,7 +1305,7 @@ col_1_text = REPEAT("c", 4000)
 DROP TABLE worklog5743;
 CREATE TABLE worklog5743 (
 col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(948))
+PRIMARY KEY (col_1_text(801))
 ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
 INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
 INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));

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

@@ -3,7 +3,7 @@ SET @save_innodb_compression_level = @@global.innodb_compression_level;
 SET global innodb_compression_level=0;
 #create table with 1K block size
 CREATE TABLE tab5 (col_1 CHAR (255) ,
-col_2 VARCHAR (255), col_3 longtext,
+col_2 VARCHAR (121), col_3 longtext,
 col_4 longtext,col_5 longtext,
 col_6 longtext , col_7 longtext ,
 col_8 longtext ,col_9 longtext ,
@@ -54,7 +54,7 @@ COMMIT;
 SET global innodb_compression_level=9;
 #create table with 1K block size
 CREATE TABLE tab6 (col_1 CHAR (255) ,
-col_2 VARCHAR (255), col_3 longtext,
+col_2 VARCHAR (121), col_3 longtext,
 col_4 longtext,col_5 longtext,
 col_6 longtext , col_7 longtext ,
 col_8 longtext ,col_9 longtext ,