Merge 10.2 into 10.3

man/mysqladmin.1

@@ -15,7 +15,7 @@
 .\" administration: server
 .\" server administration
 .SH "NAME"
-mysqladmin \- client for administering a MariaB server
+mysqladmin \- client for administering a MariaDB server
 .SH "SYNOPSIS"
 .HP \w'\fBmysqladmin\ [\fR\fB\fIoptions\fR\fR\fB]\ \fR\fB\fIcommand\fR\fR\fB\ [\fR\fB\fIcommand\-arg\fR\fR\fB]\ [\fR\fB\fIcommand\fR\fR\fB\ [\fR\fB\fIcommand\-arg\fR\fR\fB]]\ \&.\&.\&.\fR\ 'u
 \fBmysqladmin [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIcommand\fR\fR\fB [\fR\fB\fIcommand\-arg\fR\fR\fB] [\fR\fB\fIcommand\fR\fR\fB [\fR\fB\fIcommand\-arg\fR\fR\fB]] \&.\&.\&.\fR

mysql-test/main/session_tracker_last_gtid.result

@@ -32,3 +32,4 @@ drop table t1;
 -- last_gtid
 -- 0-1-1002
 
+reset master;

mysql-test/main/session_tracker_last_gtid.test

@@ -17,3 +17,4 @@ select @@last_gtid;
 drop table t1;
 
 --disable_session_track_info
+reset master;

mysql-test/suite/innodb/r/foreign_key.result

@@ -658,9 +658,9 @@ START TRANSACTION WITH CONSISTENT SNAPSHOT;
 connection default;
 DELETE IGNORE FROM t1 WHERE b = 1;
 Warnings:
-Warning	152	InnoDB: Cannot delete/update rows with cascading foreign key constraints that exceed max depth of 20. Please drop extra constraints and try again
+Warning	152	InnoDB: Cannot delete/update rows with cascading foreign key constraints that exceed max depth of 15. Please drop extra constraints and try again
 Warning	1296	Got error 193 '`test`.`t1`, CONSTRAINT `t1_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`b`) ON DELETE CASCADE' from InnoDB
-Warning	152	InnoDB: Cannot delete/update rows with cascading foreign key constraints that exceed max depth of 20. Please drop extra constraints and try again
+Warning	152	InnoDB: Cannot delete/update rows with cascading foreign key constraints that exceed max depth of 15. Please drop extra constraints and try again
 Warning	1296	Got error 193 '`test`.`t1`, CONSTRAINT `t1_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`b`) ON DELETE CASCADE' from InnoDB
 SELECT a FROM t1 FORCE INDEX(a);
 a
@@ -811,4 +811,23 @@ ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint
 Parsing foreign keys 3...
 ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 Parsing foreign keys 4...
+#
+# MDEV-27583 InnoDB uses different constants for FK cascade
+#            error message in SQL vs error log
+#
+CREATE TABLE t1
+(a INT, b INT, KEY(b),
+CONSTRAINT FOREIGN KEY (a) REFERENCES t1 (b) ON DELETE CASCADE)
+ENGINE=InnoDB;
+INSERT INTO t1 (a,b) VALUES
+(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),
+(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,1),(1,0);
+DELETE FROM t1 WHERE b = 1;
+ERROR HY000: Got error 193 '`test`.`t1`, CONSTRAINT `t1_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`b`) ON DELETE CASCADE' from InnoDB
+SHOW WARNINGS;
+Level	Code	Message
+Warning	152	InnoDB: Cannot delete/update rows with cascading foreign key constraints that exceed max depth of 15. Please drop extra constraints and try again
+Error	1296	Got error 193 '`test`.`t1`, CONSTRAINT `t1_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`b`) ON DELETE CASCADE' from InnoDB
+DROP TABLE t1;
+FOUND 1 /InnoDB: Cannot delete/update rows with cascading foreign key constraints that exceed max depth of 15.*/ in mysqld.1.err
 # End of 10.2 tests

mysql-test/suite/innodb/r/innodb-16k.result

@@ -5,11 +5,14 @@ WHERE LOWER(variable_name) = 'innodb_page_size';
 variable_value
 16384
 # Test 4) The maximum row size is dependent upon the page size.
-#         Redundant: 8123, Compact: 8126.
-#         Compressed: 8126, Dynamic: 8126.
+#         Redundant: 8123, Compact: 8126, Dynamic: 8126.
 #         Each row format has its own amount of overhead that
 #         varies depending on number of fields and other overhead.
 SET SESSION innodb_strict_mode = ON;
+SET @save_frequency=@@GLOBAL.innodb_purge_rseg_truncate_frequency;
+SET @save_level=@@GLOBAL.innodb_compression_level;
+SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
+SET GLOBAL innodb_compression_level=1;
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(200),
@@ -18,7 +21,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 (
@@ -495,10 +498,13 @@ drop table t1;
 CREATE TABLE t1(c text, PRIMARY KEY (c(440)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 ERROR 42000: 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.
-CREATE TABLE t1(c text, PRIMARY KEY (c(438)))
+CREATE TABLE t1(c text, PRIMARY KEY (c(292)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
 DROP TABLE t1;
+InnoDB		0 transactions not purged
+SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
+SET GLOBAL innodb_compression_level=@save_level;
 DROP TABLE t1_purge, t2_purge, t3_purge, t4_purge;
 DROP TABLE tlong;
 DROP TABLE tlong2;

mysql-test/suite/innodb/t/foreign_key.test

@@ -822,6 +822,29 @@ eval create table t1($fk_ref int primary key, $fk_field int, $constrs) engine in
 drop table t1;
 --enable_query_log
 
+--echo #
+--echo # MDEV-27583 InnoDB uses different constants for FK cascade
+--echo #            error message in SQL vs error log
+--echo #
+
+CREATE TABLE t1
+(a INT, b INT, KEY(b),
+CONSTRAINT FOREIGN KEY (a) REFERENCES t1 (b) ON DELETE CASCADE)
+ENGINE=InnoDB;
+
+INSERT INTO t1 (a,b) VALUES
+(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),
+(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,1),(1,0);
+
+--error ER_GET_ERRMSG
+DELETE FROM t1 WHERE b = 1;
+SHOW WARNINGS;
+DROP TABLE t1;
+
+let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
+let SEARCH_PATTERN= InnoDB: Cannot delete/update rows with cascading foreign key constraints that exceed max depth of 15.*;
+-- source include/search_pattern_in_file.inc
+
 --echo # End of 10.2 tests
 
 --source include/wait_until_count_sessions.inc

mysql-test/suite/innodb/t/innodb-16k.test

@@ -12,15 +12,17 @@ SELECT variable_value FROM information_schema.global_status
        WHERE LOWER(variable_name) = 'innodb_page_size';
 
 --echo # Test 4) The maximum row size is dependent upon the page size.
---echo #         Redundant: 8123, Compact: 8126.
---echo #         Compressed: 8126, Dynamic: 8126.
+--echo #         Redundant: 8123, Compact: 8126, Dynamic: 8126.
 --echo #         Each row format has its own amount of overhead that
 --echo #         varies depending on number of fields and other overhead.
 
 SET SESSION innodb_strict_mode = ON;
+SET @save_frequency=@@GLOBAL.innodb_purge_rseg_truncate_frequency;
+SET @save_level=@@GLOBAL.innodb_compression_level;
+SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
+SET GLOBAL innodb_compression_level=1;
 
-
-# Compressed table; 7959 bytes with 40 CHAR fields
+# Compressed table: compressBound() for the s390x DFLTCC instruction
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(200),
@@ -29,7 +31,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;
@@ -445,17 +447,17 @@ drop table t1;
 CREATE TABLE t1(c text, PRIMARY KEY (c(440)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 
-CREATE TABLE t1(c text, PRIMARY KEY (c(438)))
+CREATE TABLE t1(c text, PRIMARY KEY (c(292)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 
 INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
 
 DROP TABLE t1;
 
-# The tests that uses these tables required the purge thread to run.
-# Just in case it has not by now, provide a 10 second wait.
+--source include/wait_all_purged.inc
 
---sleep 10
+SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
+SET GLOBAL innodb_compression_level=@save_level;
 
 DROP TABLE t1_purge, t2_purge, t3_purge, t4_purge;
 DROP TABLE tlong;

mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test

@@ -333,6 +333,7 @@ CREATE TABLE t1(a TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL UNIQUE) ENGINE=InnoD
 let $fts_aux_file= `select concat('FTS_',right(concat(repeat('0',16), lower(hex(TABLE_ID))),16),'_BEING_DELETED.ibd') FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME='test/t1'`;
 write_file $MYSQLD_DATADIR/test/$fts_aux_file;
 EOF
+--replace_regex /".*" from/"Resource temporarily unavailable" from/
 --error ER_GET_ERRNO
 ALTER TABLE t1 ADD FULLTEXT(a), ALGORITHM=INPLACE;
 DROP TABLE t1;

mysql-test/suite/innodb_zip/include/innodb_create_tab_indx.inc

@@ -2,7 +2,7 @@
 
 eval CREATE TABLE tab5(col_1 TINYBLOB, col_2 TINYTEXT,col_3 BLOB,
 col_4 TEXT,col_5 MEDIUMBLOB,col_6 MEDIUMTEXT,
-col_7 LONGBLOB,col_8 LONGTEXT,col_9 VARCHAR(255))
+col_7 LONGBLOB,col_8 LONGTEXT,col_9 VARCHAR(67))
 ENGINE=INNODB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=$block_size;
 
 

mysql-test/suite/innodb_zip/include/innodb_load_data.inc

@@ -1,14 +1,14 @@
 --echo # Load the data
 
-SET @col_1 = repeat('a', 100);
-SET @col_2 = repeat('b', 100);
-SET @col_3 = repeat('c', 100);
-SET @col_4 = repeat('d', 100);
-SET @col_5 = repeat('e', 100);
-SET @col_6 = repeat('f', 100);
-SET @col_7 = repeat('g', 100);
-SET @col_8 = repeat('h', 100);
-SET @col_9 = repeat('i', 100);
+SET @col_1 = repeat('a', 67);
+SET @col_2 = repeat('b', 67);
+SET @col_3 = repeat('c', 67);
+SET @col_4 = repeat('d', 67);
+SET @col_5 = repeat('e', 67);
+SET @col_6 = repeat('f', 67);
+SET @col_7 = repeat('g', 67);
+SET @col_8 = repeat('h', 67);
+SET @col_9 = repeat('i', 67);
 
 while ($i) {
 

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,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 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));
 ERROR 42000: 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
 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,15 +127,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 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));
 ERROR 42000: 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
 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,15 +149,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 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));
 ERROR 42000: 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
 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;