Merge 10.3 into 10.4

cmake/cpack_rpm.cmake

@@ -37,7 +37,7 @@ IF(CMAKE_VERSION VERSION_LESS "3.6.0")
   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
 ELSE()
   SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
-  SET(CPACK_RPM_DEBUGINFO_PACKAGE ON)
+  SET(CPACK_RPM_DEBUGINFO_PACKAGE ON CACHE INTERNAL "")
 ENDIF()
 
 SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")

debian/po/ca.po

@@ -203,13 +203,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.4.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "El MySQL nom�s s'instal�la en cas de tenir un nom d'ordinador central que "
 #~ "no sigui num�ric  i que es pugui resoldre a trav�s del fitxer /etc/hosts. "
 #~ "Ex. si l'ordre \"hostname\" retorna \"myhostname\", llavors hi ha d'haver "
-#~ "una l�nia com la seg�ent \"10.4.0.1 myhostname\"."
+#~ "una lnia com la segent \"10.0.0.1 myhostname\"."
 
 #, fuzzy
 #~ msgid ""

debian/po/cs.po

@@ -310,13 +310,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.4.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL se nainstaluje pouze v případě, že používáte nenumerické jméno "
 #~ "počítače, které se dá přeložit přes soubor /etc/hosts. Např. když příkaz "
 #~ "\"hostname\" vrátí \"diamond\", tak v /etc/hosts musí existovat obdobný "
-#~ "řádek jako \"10.4.0.1 diamond\"."
+#~ "řádek jako \"10.0.0.1 diamond\"."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "

debian/po/es.po

@@ -354,13 +354,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.4.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "Sólo se instalará MySQL si tiene un nombre de equipo que no sea una "
 #~ "dirección IP y pueda resolverse a través del archivo /etc/hosts. Por "
 #~ "ejemplo, si la orden «hostname» devuelve «MiNombreEquipo» entonces deberá "
-#~ "existir una línea «10.4.0.1 MiNombreEquipo» en dicho archivo."
+#~ "existir una línea «10.0.0.1 MiNombreEquipo» en dicho archivo."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "

debian/po/pt_BR.po

@@ -322,13 +322,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.4.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "O MySQL será instalado somente caso você possua um nome de host NÃO "
 #~ "NUMÉRICO que possa ser resolvido através do arquivo /etc/hosts, ou seja, "
 #~ "caso o comando \"hostname\" retorne \"myhostname\", uma linha como "
-#~ "\"10.4.0.1 myhostname\" deverá existir no arquivo /etc/hosts."
+#~ "\"10.0.0.1 myhostname\" deverá existir no arquivo /etc/hosts."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "

debian/po/tr.po

@@ -202,12 +202,12 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.4.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL sadece /etc/hosts dosyası yoluyla çözülebilir NUMERİK OLMAYAN bir "
 #~ "makine adına sahipseniz kurulacaktır. Örneğin, eğer \"hostname\" komutu "
-#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.4.0.1 makinem\" "
+#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.0.0.1 makinem\" "
 #~ "gibi bir satır olmalıdır."
 
 #, fuzzy

extra/mariabackup/xtrabackup.cc

@@ -4146,9 +4146,12 @@ static bool xtrabackup_backup_func()
 
 	log_header_read(max_cp_field);
 
-	if (checkpoint_no_start != mach_read_from_8(buf + LOG_CHECKPOINT_NO)) {
+	if (checkpoint_no_start != mach_read_from_8(buf + LOG_CHECKPOINT_NO)
+	    || checkpoint_lsn_start
+	    != mach_read_from_8(buf + LOG_CHECKPOINT_LSN)
+	    || log_sys.log.get_lsn_offset()
+	    != mach_read_from_8(buf + LOG_CHECKPOINT_OFFSET))
 		goto reread_log_header;
-	}
 
 	log_mutex_exit();
 
@@ -4168,42 +4171,39 @@ static bool xtrabackup_backup_func()
 	}
 
 	/* label it */
-	byte MY_ALIGNED(OS_FILE_LOG_BLOCK_SIZE) log_hdr[OS_FILE_LOG_BLOCK_SIZE];
-	memset(log_hdr, 0, sizeof log_hdr);
-	mach_write_to_4(LOG_HEADER_FORMAT + log_hdr, log_sys.log.format);
-	mach_write_to_4(LOG_HEADER_SUBFORMAT + log_hdr, log_sys.log.subformat);
-	mach_write_to_8(LOG_HEADER_START_LSN + log_hdr, checkpoint_lsn_start);
-	strcpy(reinterpret_cast<char*>(LOG_HEADER_CREATOR + log_hdr),
-	       "Backup " MYSQL_SERVER_VERSION);
-	log_block_set_checksum(log_hdr,
-			       log_block_calc_checksum_crc32(log_hdr));
-
-	/* Write the log header. */
-	if (ds_write(dst_log_file, log_hdr, sizeof log_hdr)) {
-	log_write_fail:
-		msg("error: write to logfile failed");
-		goto fail;
-	}
-	/* Adjust the checkpoint page. */
-	memcpy(log_hdr, buf, OS_FILE_LOG_BLOCK_SIZE);
-	mach_write_to_8(log_hdr + LOG_CHECKPOINT_OFFSET,
-			(checkpoint_lsn_start & (OS_FILE_LOG_BLOCK_SIZE - 1))
-			| LOG_FILE_HDR_SIZE);
+	byte MY_ALIGNED(OS_FILE_LOG_BLOCK_SIZE) log_hdr_buf[LOG_FILE_HDR_SIZE];
+	memset(log_hdr_buf, 0, sizeof log_hdr_buf);
+
+	byte *log_hdr_field = log_hdr_buf;
+	mach_write_to_4(LOG_HEADER_FORMAT + log_hdr_field, log_sys.log.format);
+	mach_write_to_4(LOG_HEADER_SUBFORMAT + log_hdr_field, log_sys.log.subformat);
+	mach_write_to_8(LOG_HEADER_START_LSN + log_hdr_field, checkpoint_lsn_start);
+	strcpy(reinterpret_cast<char*>(LOG_HEADER_CREATOR + log_hdr_field),
+		"Backup " MYSQL_SERVER_VERSION);
+	log_block_set_checksum(log_hdr_field,
+		log_block_calc_checksum_crc32(log_hdr_field));
+
+	/* copied from log_group_checkpoint() */
+	log_hdr_field +=
+		(log_sys.next_checkpoint_no & 1) ? LOG_CHECKPOINT_2 : LOG_CHECKPOINT_1;
 	/* The least significant bits of LOG_CHECKPOINT_OFFSET must be
 	stored correctly in the copy of the ib_logfile. The most significant
 	bits, which identify the start offset of the log block in the file,
 	we did choose freely, as LOG_FILE_HDR_SIZE. */
 	ut_ad(!((log_sys.log.get_lsn() ^ checkpoint_lsn_start)
 		& (OS_FILE_LOG_BLOCK_SIZE - 1)));
-	log_block_set_checksum(log_hdr,
-			       log_block_calc_checksum_crc32(log_hdr));
-	/* Write checkpoint page 1 and two empty log pages before the
-	payload. */
-	if (ds_write(dst_log_file, log_hdr, OS_FILE_LOG_BLOCK_SIZE)
-	    || !memset(log_hdr, 0, sizeof log_hdr)
-	    || ds_write(dst_log_file, log_hdr, sizeof log_hdr)
-	    || ds_write(dst_log_file, log_hdr, sizeof log_hdr)) {
-		goto log_write_fail;
+	/* Adjust the checkpoint page. */
+	memcpy(log_hdr_field, log_sys.checkpoint_buf, OS_FILE_LOG_BLOCK_SIZE);
+	mach_write_to_8(log_hdr_field + LOG_CHECKPOINT_OFFSET,
+		(checkpoint_lsn_start & (OS_FILE_LOG_BLOCK_SIZE - 1))
+		| LOG_FILE_HDR_SIZE);
+	log_block_set_checksum(log_hdr_field,
+			log_block_calc_checksum_crc32(log_hdr_field));
+
+	/* Write log header*/
+	if (ds_write(dst_log_file, log_hdr_buf, sizeof(log_hdr_buf))) {
+		msg("error: write to logfile failed");
+		goto fail;
 	}
 
 	log_copying_running = true;

include/my_valgrind.h

-/* Copyright (C) 2010, 2017, MariaDB Corporation.
+/* Copyright (C) 2010, 2019, MariaDB Corporation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,6 +13,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
+#ifndef MY_VALGRIND_INCLUDED
+#define MY_VALGRIND_INCLUDED
+
 /* clang -> gcc */
 #ifndef __has_feature
 # define __has_feature(x) 0
@@ -33,6 +36,7 @@
 # define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
 # define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len)
 # define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len)
+# define REDZONE_SIZE 8
 #elif defined(__SANITIZE_ADDRESS__)
 # include <sanitizer/asan_interface.h>
 /* How to do manual poisoning:
@@ -41,11 +45,13 @@
 # define MEM_NOACCESS(a,len) ASAN_POISON_MEMORY_REGION(a,len)
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
+# define REDZONE_SIZE 8
 #else
 # define MEM_UNDEFINED(a,len) ((void) (a), (void) (len))
 # define MEM_NOACCESS(a,len) ((void) 0)
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
+# define REDZONE_SIZE 0
 #endif /* HAVE_VALGRIND_MEMCHECK_H */
 
 #if defined(TRASH_FREED_MEMORY)
@@ -56,3 +62,5 @@
 
 #define TRASH_ALLOC(A,B) do { TRASH_FILL(A,B,0xA5); MEM_UNDEFINED(A,B); } while(0)
 #define TRASH_FREE(A,B) do { TRASH_FILL(A,B,0x8F); MEM_NOACCESS(A,B); } while(0)
+
+#endif /* MY_VALGRIND_INCLUDED */

man/mysqlimport.1

 '\" t
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "28 March 2019" "MariaDB 10\&.4" "MariaDB Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "21 May 2019" "MariaDB 10\&.4" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -346,6 +346,22 @@ option\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: ignore-foreign-keys option
+.\" ignore-foreign-keys option: mysqlimport
+\fB\-\-ignore\-foreign\-keys\fR,
+\fB\-k\fR
+.sp
+Disable foreign key checks while importing the data\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: ignore-lines option
 .\" ignore-lines option: mysqlimport
 \fB\-\-ignore\-lines=\fR\fB\fIN\fR\fR

mysql-test/main/delete_use_source.test

 --source include/have_sequence.inc
 --source include/have_innodb.inc
+# This test is slow on buildbot.
+--source include/big_test.inc
 create table t1(c1 integer not null,c2 integer not null, key (c1)) engine=InnoDb;
 create view v1 as select * from t1 where c1 in (0,1);
 

mysql-test/main/disabled.def

@@ -19,4 +19,3 @@ innodb_bug12902967       : broken upstream
 file_contents            : MDEV-6526 these files are not installed anymore
 max_statement_time       : cannot possibly work, depends on timing
 partition_open_files_limit : open_files_limit check broken by MDEV-18360
-join_cache               : enable after MDEV-17752 is fixed

mysql-test/main/join_nested_jcl6.result

@@ -1342,7 +1342,7 @@ EXPLAIN SELECT * FROM t1 LEFT JOIN (t2 LEFT JOIN t3 ON c21=c31) ON c11=c21;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	
 1	SIMPLE	t2	hash_ALL	NULL	#hash#$hj	5	test.t1.c11	0	Using where; Using join buffer (flat, BNLH join)
-1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	0	Using where; Using join buffer (incremental, BNL join)
+1	SIMPLE	t3	hash_ALL	NULL	#hash#$hj	5	test.t1.c11	0	Using where; Using join buffer (incremental, BNLH join)
 DROP TABLE t1,t2,t3;
 CREATE TABLE t1 (goods int(12) NOT NULL, price varchar(128) NOT NULL);
 INSERT INTO t1 VALUES (23, 2340), (26, 9900);

mysql-test/main/join_outer.result

@@ -2003,6 +2003,7 @@ INSERT INTO t2 VALUES
 CREATE TABLE t3 ( a int, b int NOT NULL , PRIMARY KEY (b)) ;
 INSERT INTO t3 VALUES 
 (0,6),(0,7),(0,8),(2,9),(0,10),(2,21),(0,22),(2,23),(2,24),(2,25);
+set @save_join_cache_level= @@join_cache_level;
 SET SESSION join_cache_level=4;
 EXPLAIN EXTENDED
 SELECT * FROM (t2 LEFT JOIN t1 ON t1.b = t2.b) JOIN t3 ON t1.b = t3.b;
@@ -2021,7 +2022,7 @@ EXECUTE stmt;
 b	b	a	b
 10	10	0	10
 DEALLOCATE PREPARE stmt;
-SET SESSION join_cache_level=default;
+SET SESSION join_cache_level=@save_join_cache_level;
 DROP TABLE t1,t2,t3;
 #
 # LP bug #943543: LEFT JOIN converted to JOIN with 
@@ -2448,7 +2449,7 @@ t1.b1+'0'	t2.b2 + '0'
 0	0
 1	1
 DROP TABLE t1, t2;
-set @join_cache_level= @save_join_cache_level;
+set @@join_cache_level= @save_join_cache_level;
 #
 # MDEV-14779: using left join causes incorrect results with materialization and derived tables
 #
@@ -2515,6 +2516,143 @@ v2
 DROP TABLE t1,t2;
 # end of 5.5 tests
 #
+# MDEV-19258: chained right joins all converted to inner joins
+#
+CREATE TABLE t1 (
+id int NOT NULL AUTO_INCREMENT,
+timestamp bigint NOT NULL,
+modifiedBy varchar(255) DEFAULT NULL,
+PRIMARY KEY (id)
+);
+CREATE TABLE t2 (
+id int NOT NULL,
+REV int NOT NULL,
+REVTYPE tinyint DEFAULT NULL,
+profile_id int DEFAULT NULL,
+PRIMARY KEY (id,REV)
+);
+CREATE TABLE t3 (
+id int NOT NULL,
+REV int NOT NULL,
+person_id int DEFAULT NULL,
+PRIMARY KEY (id,REV)
+);
+CREATE TABLE t4 (
+id int NOT NULL,
+REV int NOT NULL,
+PRIMARY KEY (id,REV)
+);
+INSERT INTO t1 VALUES
+(1,1294391193890,'Cxqy$*9.kKeE'),(2,1294643906883,'rE4wqGV0gif@'),
+(3,1294643927456,'L?3yt(%dY$Br'),(4,1294644343525,'WH&ObiZ$#2S4'),
+(5,1294644616416,'YXnCbt?olUZ0'),(6,1294644954537,'8Npe4!(#lU@k'),
+(7,1294645046659,'knc0GhXB1#ib'),(8,1294645183829,'w*oPpVfuS8^m'),
+(9,1294645386701,'hwXR@3qVzrbU'),(10,1294645525982,'BeLW*Y9ndP0l'),
+(11,1294645627723,'nTegib^)qZ$I'),(12,1294650860266,'u62C^Kzx3wH8'),
+(13,1294657613745,'4&BkFjGa!qLg'),(14,1294660627161,')anpt312SCoh'),
+(15,1294661023336,'LtJ2PX?*kTmx'),(16,1294662838066,'POGRr@?#ofpl'),
+(17,1294663020989,'o.)1EOT2jnF7'),(18,1294663308065,'&TZ0F0LHE6.h'),
+(19,1294664900039,'j)kSC%^In$9d'),(20,1294668904556,'97glN50)cAo.'),
+(21,1294728056853,'lrKZxmw?I.Ek'),(22,1294728157174,'@P*SRg!pT.q?'),
+(23,1294728327099,'W9gPrptF.)8n'),(24,1294728418481,'$q*c^sM&URd#'),
+(25,1294728729620,'9*f4&bTPRtHo'),(26,1294728906014,')4VtTEnS7$oI'),
+(27,1294732190003,'8dkNSPq2u3AQ'),(28,1294733205065,'SV2N6IoEf438'),
+(29,1294741984927,'rBKj.0S^Ey%*'),(30,1294751748352,'j$2DvlBqk)Fw'),
+(31,1294753902212,'C$N6OrEw8elz'),(32,1294758120598,'DCSVZw!rnxXq'),
+(33,1294761769556,'OTS@QU8a6s5c'),(34,1294816845305,'IUE2stG0D3L5'),
+(35,1294816966909,'Xd16yka.9nHe'),(36,1294817116302,'lOQHZpm%!8qb'),
+(37,1294817374775,'^&pE3IhNf7ey'),(38,1294817538907,'oEn4#7C0Vhfp'),
+(39,1294818482950,'bx54J*O0Va&?'),(40,1294819047024,'J%@a&1.qgdb?'),
+(41,1294821826077,'C9kojr$L3Phz'),(42,1294825454458,'gG#BOnM80ZPi'),
+(43,1294904129918,'F^!TrjM#zdvc'),(44,1294904254166,'Va&Tb)k0RvlM'),
+(45,1294904414964,'dJjq0M6HvhR#'),(46,1294904505784,'nJmxg)ELqY(b'),
+(47,1294904602835,'dhF#or$Vge!7'),(48,1294904684728,'?bIh5E3l!0em'),
+(49,1294904877898,'Y*WflOdcxnk.'),(50,1294905002390,'*?H!lUgez5A.'),
+(51,1294905096043,'wlEIY3n9uz!p'),(52,1294905404621,'T?qv3H6&hlQD'),
+(53,1294905603922,'S@Bhys^Ti7bt'),(54,1294905788416,'KR?a5NVukz#l'),
+(55,1294905993190,'A*&q4kWhED!o'),(56,1294906205254,'fT0%7z0DF6h*'),
+(57,1294906319680,'LhzdW4?ivjR0'),(58,1294906424296,'h0KDlns%U*6T'),
+(59,1294906623844,'b$CfB1noI6Ax'),(60,1294911258896,'#T1*LP!3$Oys');
+INSERT INTO t2 VALUES
+(1,1,0,10209),(1,42480,1,10209),(1,61612,1,10209),(1,257545,1,10209),
+(1,385332,1,10209),(1,1687999,1,10209),(3,1,0,10210),(3,617411,2,10210),
+(4,11,0,14),(4,95149,1,10211),(4,607890,2,10211),(5,1,0,10212),
+(6,1,0,10213),(6,93344,1,10213),(6,295578,1,10213),(6,295579,1,10213),
+(6,295644,1,10213),(7,1,0,10214),(7,12,1,7),(7,688796,1,10214),
+(7,1140433,1,10214),(7,1715227,1,10214),(8,1,0,10215),(8,74253,1,10215),
+(8,93345,1,10215),(8,12,2,2),(9,1,0,10216),(9,93342,1,10216),
+(9,122354,1,10216),(9,301499,2,10216),(10,11,0,5),(10,93343,1,10217),
+(10,122355,1,10217),(10,123050,1,10217),(10,301500,2,10217),(11,1,0,10218),
+(11,87852,1,10218),(11,605499,2,10218),(12,1,0,10219),(12,88024,1,10219),
+(12,605892,2,10219),(13,1,0,10220);
+INSERT INTO t3 VALUES
+(1,1,300003),(1,117548,NULL),(2,1,300003),(2,117548,300006),
+(3,1,300153),(3,117548,NULL),(4,1,300153),(4,117548,NULL),
+(5,1,300153),(5,117548,NULL),(6,1,300182),(6,117548,NULL),
+(7,1,300205),(7,117548,NULL),(8,1,300217),(8,117548,NULL),
+(9,1,300290),(9,117548,NULL),(10,1,300290),(10,117548,NULL),
+(11,1,300405),(11,117548,NULL),(12,1,300670),(12,117548,NULL),
+(13,1,300670),(13,117548,NULL),(14,1,300006),(14,117548,NULL),
+(15,1,300671),(15,117548,NULL),(16,1,300732),(16,117548,NULL);
+INSERT INTO t4 VALUES
+(300000,1),(300001,1),(300003,1),(300004,1),
+(300005,1),(300005,688796),(300006,1),(300006,97697),
+(300009,1),(300010,1),(300011,1),(300012,1),(300013,1),
+(300014,1),(300015,1),(300016,1),(300017,1),(300018,1),
+(300019,1),(300020,1),(300021,1),(300022,1),(300023,1),
+(300024,1),(300025,1),(300026,1),(300027,1),(300028,1);
+# This should have join order of t2,t3,t4,t1
+EXPLAIN EXTENDED SELECT *
+FROM t1 INNER JOIN t2 ON t2.REV=t1.id
+INNER JOIN t3 ON t3.id=t2.profile_id
+INNER JOIN t4 ON t4.id=t3.person_id
+WHERE t1.timestamp < 1294664900039 AND t1.timestamp > 1294644616416  AND
+t2.REVTYPE=2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	42	100.00	Using where
+1	SIMPLE	t3	ref	PRIMARY	PRIMARY	4	test.t2.profile_id	1	100.00	Using where
+1	SIMPLE	t4	ref	PRIMARY	PRIMARY	4	test.t3.person_id	1	100.00	Using index
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.REV	1	100.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`id` AS `id`,`test`.`t1`.`timestamp` AS `timestamp`,`test`.`t1`.`modifiedBy` AS `modifiedBy`,`test`.`t2`.`id` AS `id`,`test`.`t2`.`REV` AS `REV`,`test`.`t2`.`REVTYPE` AS `REVTYPE`,`test`.`t2`.`profile_id` AS `profile_id`,`test`.`t3`.`id` AS `id`,`test`.`t3`.`REV` AS `REV`,`test`.`t3`.`person_id` AS `person_id`,`test`.`t4`.`id` AS `id`,`test`.`t4`.`REV` AS `REV` from `test`.`t1` join `test`.`t2` join `test`.`t3` join `test`.`t4` where `test`.`t2`.`REVTYPE` = 2 and `test`.`t4`.`id` = `test`.`t3`.`person_id` and `test`.`t3`.`id` = `test`.`t2`.`profile_id` and `test`.`t1`.`id` = `test`.`t2`.`REV` and `test`.`t1`.`timestamp` < 1294664900039 and `test`.`t1`.`timestamp` > 1294644616416
+SELECT *
+FROM t1 INNER JOIN t2 ON t2.REV=t1.id
+INNER JOIN t3 ON t3.id=t2.profile_id
+INNER JOIN t4 ON t4.id=t3.person_id
+WHERE t1.timestamp < 1294664900039 AND t1.timestamp > 1294644616416  AND
+t2.REVTYPE=2;
+id	timestamp	modifiedBy	id	REV	REVTYPE	profile_id	id	REV	person_id	id	REV
+12	1294650860266	u62C^Kzx3wH8	8	12	2	2	2	1	300003	300003	1
+12	1294650860266	u62C^Kzx3wH8	8	12	2	2	2	117548	300006	300006	1
+12	1294650860266	u62C^Kzx3wH8	8	12	2	2	2	117548	300006	300006	97697
+# This should have join order of t2,t3,t4,t1 with the same plan as above
+# because all RIGHT JOIN operations are converted into INNER JOIN
+EXPLAIN EXTENDED SELECT *
+FROM t1 RIGHT JOIN t2 ON t2.REV=t1.id
+RIGHT JOIN t3 ON t3.id=t2.profile_id
+RIGHT JOIN t4 ON t4.id=t3.person_id
+WHERE t1.timestamp < 1294664900039 AND t1.timestamp > 1294644616416
+AND t2.REVTYPE=2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	42	100.00	Using where
+1	SIMPLE	t3	ref	PRIMARY	PRIMARY	4	test.t2.profile_id	1	100.00	Using where
+1	SIMPLE	t4	ref	PRIMARY	PRIMARY	4	test.t3.person_id	1	100.00	Using index
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.REV	1	100.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`id` AS `id`,`test`.`t1`.`timestamp` AS `timestamp`,`test`.`t1`.`modifiedBy` AS `modifiedBy`,`test`.`t2`.`id` AS `id`,`test`.`t2`.`REV` AS `REV`,`test`.`t2`.`REVTYPE` AS `REVTYPE`,`test`.`t2`.`profile_id` AS `profile_id`,`test`.`t3`.`id` AS `id`,`test`.`t3`.`REV` AS `REV`,`test`.`t3`.`person_id` AS `person_id`,`test`.`t4`.`id` AS `id`,`test`.`t4`.`REV` AS `REV` from `test`.`t4` join `test`.`t3` join `test`.`t2` join `test`.`t1` where `test`.`t2`.`REVTYPE` = 2 and `test`.`t1`.`id` = `test`.`t2`.`REV` and `test`.`t3`.`id` = `test`.`t2`.`profile_id` and `test`.`t4`.`id` = `test`.`t3`.`person_id` and `test`.`t1`.`timestamp` < 1294664900039 and `test`.`t1`.`timestamp` > 1294644616416
+SELECT *
+FROM t1 RIGHT JOIN t2 ON t2.REV=t1.id
+RIGHT JOIN t3 ON t3.id=t2.profile_id
+RIGHT JOIN t4 ON t4.id=t3.person_id
+WHERE t1.timestamp < 1294664900039 AND t1.timestamp > 1294644616416
+AND t2.REVTYPE=2;
+id	timestamp	modifiedBy	id	REV	REVTYPE	profile_id	id	REV	person_id	id	REV
+12	1294650860266	u62C^Kzx3wH8	8	12	2	2	2	1	300003	300003	1
+12	1294650860266	u62C^Kzx3wH8	8	12	2	2	2	117548	300006	300006	1
+12	1294650860266	u62C^Kzx3wH8	8	12	2	2	2	117548	300006	300006	97697
+DROP TABLE t1,t2,t3,t4;
+# end of 10.1 tests
+#
 # MDEV-17518: Range optimization doesn't use ON expressions from nested outer joins
 #
 create table t1(a int);

mysql-test/main/join_outer.test

@@ -1575,6 +1575,7 @@ CREATE TABLE t3 ( a int, b int NOT NULL , PRIMARY KEY (b)) ;
 INSERT INTO t3 VALUES 
   (0,6),(0,7),(0,8),(2,9),(0,10),(2,21),(0,22),(2,23),(2,24),(2,25);
 
+set @save_join_cache_level= @@join_cache_level;
 SET SESSION join_cache_level=4;
 
 EXPLAIN EXTENDED
@@ -1588,7 +1589,7 @@ EXECUTE stmt;
 
 DEALLOCATE PREPARE stmt;
 
-SET SESSION join_cache_level=default;
+SET SESSION join_cache_level=@save_join_cache_level;
 
 DROP TABLE t1,t2,t3;
 
@@ -1976,7 +1977,7 @@ set @save_join_cache_level= @@join_cache_level;
 SET  @@join_cache_level = 3;
 SELECT t1.b1+'0' , t2.b2 + '0' FROM t1 LEFT JOIN t2 ON b1 = b2;
 DROP TABLE t1, t2;
-set @join_cache_level= @save_join_cache_level;
+set @@join_cache_level= @save_join_cache_level;
 
 --echo #
 --echo # MDEV-14779: using left join causes incorrect results with materialization and derived tables
@@ -2042,6 +2043,131 @@ DROP TABLE t1,t2;
 
 --echo # end of 5.5 tests
 
+--echo #
+--echo # MDEV-19258: chained right joins all converted to inner joins
+--echo #
+
+ CREATE TABLE t1 (
+  id int NOT NULL AUTO_INCREMENT,
+  timestamp bigint NOT NULL,
+  modifiedBy varchar(255) DEFAULT NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE t2 (
+  id int NOT NULL,
+  REV int NOT NULL,
+  REVTYPE tinyint DEFAULT NULL,
+  profile_id int DEFAULT NULL,
+  PRIMARY KEY (id,REV)
+);
+
+CREATE TABLE t3 (
+  id int NOT NULL,
+  REV int NOT NULL,
+  person_id int DEFAULT NULL,
+  PRIMARY KEY (id,REV)
+);
+
+CREATE TABLE t4 (
+  id int NOT NULL,
+  REV int NOT NULL,
+  PRIMARY KEY (id,REV)
+);
+
+INSERT INTO t1 VALUES
+(1,1294391193890,'Cxqy$*9.kKeE'),(2,1294643906883,'rE4wqGV0gif@'),
+(3,1294643927456,'L?3yt(%dY$Br'),(4,1294644343525,'WH&ObiZ$#2S4'),
+(5,1294644616416,'YXnCbt?olUZ0'),(6,1294644954537,'8Npe4!(#lU@k'),
+(7,1294645046659,'knc0GhXB1#ib'),(8,1294645183829,'w*oPpVfuS8^m'),
+(9,1294645386701,'hwXR@3qVzrbU'),(10,1294645525982,'BeLW*Y9ndP0l'),
+(11,1294645627723,'nTegib^)qZ$I'),(12,1294650860266,'u62C^Kzx3wH8'),
+(13,1294657613745,'4&BkFjGa!qLg'),(14,1294660627161,')anpt312SCoh'),
+(15,1294661023336,'LtJ2PX?*kTmx'),(16,1294662838066,'POGRr@?#ofpl'),
+(17,1294663020989,'o.)1EOT2jnF7'),(18,1294663308065,'&TZ0F0LHE6.h'),
+(19,1294664900039,'j)kSC%^In$9d'),(20,1294668904556,'97glN50)cAo.'),
+(21,1294728056853,'lrKZxmw?I.Ek'),(22,1294728157174,'@P*SRg!pT.q?'),
+(23,1294728327099,'W9gPrptF.)8n'),(24,1294728418481,'$q*c^sM&URd#'),
+(25,1294728729620,'9*f4&bTPRtHo'),(26,1294728906014,')4VtTEnS7$oI'),
+(27,1294732190003,'8dkNSPq2u3AQ'),(28,1294733205065,'SV2N6IoEf438'),
+(29,1294741984927,'rBKj.0S^Ey%*'),(30,1294751748352,'j$2DvlBqk)Fw'),
+(31,1294753902212,'C$N6OrEw8elz'),(32,1294758120598,'DCSVZw!rnxXq'),
+(33,1294761769556,'OTS@QU8a6s5c'),(34,1294816845305,'IUE2stG0D3L5'),
+(35,1294816966909,'Xd16yka.9nHe'),(36,1294817116302,'lOQHZpm%!8qb'),
+(37,1294817374775,'^&pE3IhNf7ey'),(38,1294817538907,'oEn4#7C0Vhfp'),
+(39,1294818482950,'bx54J*O0Va&?'),(40,1294819047024,'J%@a&1.qgdb?'),
+(41,1294821826077,'C9kojr$L3Phz'),(42,1294825454458,'gG#BOnM80ZPi'),
+(43,1294904129918,'F^!TrjM#zdvc'),(44,1294904254166,'Va&Tb)k0RvlM'),
+(45,1294904414964,'dJjq0M6HvhR#'),(46,1294904505784,'nJmxg)ELqY(b'),
+(47,1294904602835,'dhF#or$Vge!7'),(48,1294904684728,'?bIh5E3l!0em'),
+(49,1294904877898,'Y*WflOdcxnk.'),(50,1294905002390,'*?H!lUgez5A.'),
+(51,1294905096043,'wlEIY3n9uz!p'),(52,1294905404621,'T?qv3H6&hlQD'),
+(53,1294905603922,'S@Bhys^Ti7bt'),(54,1294905788416,'KR?a5NVukz#l'),
+(55,1294905993190,'A*&q4kWhED!o'),(56,1294906205254,'fT0%7z0DF6h*'),
+(57,1294906319680,'LhzdW4?ivjR0'),(58,1294906424296,'h0KDlns%U*6T'),
+(59,1294906623844,'b$CfB1noI6Ax'),(60,1294911258896,'#T1*LP!3$Oys');
+
+
+INSERT INTO t2 VALUES
+(1,1,0,10209),(1,42480,1,10209),(1,61612,1,10209),(1,257545,1,10209),
+(1,385332,1,10209),(1,1687999,1,10209),(3,1,0,10210),(3,617411,2,10210),
+(4,11,0,14),(4,95149,1,10211),(4,607890,2,10211),(5,1,0,10212),
+(6,1,0,10213),(6,93344,1,10213),(6,295578,1,10213),(6,295579,1,10213),
+(6,295644,1,10213),(7,1,0,10214),(7,12,1,7),(7,688796,1,10214),
+(7,1140433,1,10214),(7,1715227,1,10214),(8,1,0,10215),(8,74253,1,10215),
+(8,93345,1,10215),(8,12,2,2),(9,1,0,10216),(9,93342,1,10216),
+(9,122354,1,10216),(9,301499,2,10216),(10,11,0,5),(10,93343,1,10217),
+(10,122355,1,10217),(10,123050,1,10217),(10,301500,2,10217),(11,1,0,10218),
+(11,87852,1,10218),(11,605499,2,10218),(12,1,0,10219),(12,88024,1,10219),
+(12,605892,2,10219),(13,1,0,10220);
+
+INSERT INTO t3 VALUES
+(1,1,300003),(1,117548,NULL),(2,1,300003),(2,117548,300006),
+(3,1,300153),(3,117548,NULL),(4,1,300153),(4,117548,NULL),
+(5,1,300153),(5,117548,NULL),(6,1,300182),(6,117548,NULL),
+(7,1,300205),(7,117548,NULL),(8,1,300217),(8,117548,NULL),
+(9,1,300290),(9,117548,NULL),(10,1,300290),(10,117548,NULL),
+(11,1,300405),(11,117548,NULL),(12,1,300670),(12,117548,NULL),
+(13,1,300670),(13,117548,NULL),(14,1,300006),(14,117548,NULL),
+(15,1,300671),(15,117548,NULL),(16,1,300732),(16,117548,NULL);
+
+INSERT INTO t4 VALUES
+(300000,1),(300001,1),(300003,1),(300004,1),
+(300005,1),(300005,688796),(300006,1),(300006,97697),
+(300009,1),(300010,1),(300011,1),(300012,1),(300013,1),
+(300014,1),(300015,1),(300016,1),(300017,1),(300018,1),
+(300019,1),(300020,1),(300021,1),(300022,1),(300023,1),
+(300024,1),(300025,1),(300026,1),(300027,1),(300028,1);
+
+let $q1=
+SELECT *
+FROM t1 INNER JOIN t2 ON t2.REV=t1.id
+        INNER JOIN t3 ON t3.id=t2.profile_id
+        INNER JOIN t4 ON t4.id=t3.person_id
+WHERE t1.timestamp < 1294664900039 AND t1.timestamp > 1294644616416  AND
+      t2.REVTYPE=2;
+
+--echo # This should have join order of t2,t3,t4,t1
+eval EXPLAIN EXTENDED $q1;
+eval $q1;
+
+let $q2=
+SELECT *
+FROM t1 RIGHT JOIN t2 ON t2.REV=t1.id
+        RIGHT JOIN t3 ON t3.id=t2.profile_id
+        RIGHT JOIN t4 ON t4.id=t3.person_id
+WHERE t1.timestamp < 1294664900039 AND t1.timestamp > 1294644616416
+      AND t2.REVTYPE=2;
+
+--echo # This should have join order of t2,t3,t4,t1 with the same plan as above
+--echo # because all RIGHT JOIN operations are converted into INNER JOIN
+eval EXPLAIN EXTENDED $q2;
+eval $q2;
+
+DROP TABLE t1,t2,t3,t4;
+
+--echo # end of 10.1 tests
+
 --echo #
 --echo # MDEV-17518: Range optimization doesn't use ON expressions from nested outer joins
 --echo #

mysql-test/main/lowercase_table4.test

 --source include/have_case_insensitive_file_system.inc
 --source include/have_innodb.inc
+# This test is slow on buildbot.
+--source include/big_test.inc
 
 --echo #
 --echo # Bug#46941 crash with lower_case_table_names=2 and

mysql-test/main/mysql_client_test.test

@@ -2,6 +2,8 @@
 -- source include/not_embedded.inc
 # need to have the dynamic loading turned on for the client plugin tests
 --source include/have_plugin_auth.inc
+# This test is slow on buildbot.
+--source include/big_test.inc
 
 SET @old_general_log= @@global.general_log;
 SET @old_slow_query_log= @@global.slow_query_log;

mysql-test/main/mysql_client_test_nonblock.test

@@ -2,6 +2,8 @@
 
 # The non-blocking API is not supported in the embedded server.
 -- source include/not_embedded.inc
+# This test is slow on buildbot.
+--source include/big_test.inc
 
 SET @old_general_log= @@global.general_log;
 SET @old_slow_query_log= @@global.slow_query_log;

mysql-test/main/mysqldump.test

@@ -19,6 +19,9 @@ let collation=utf8_unicode_ci;
 # There are tables in 'mysql' database of type innodb
 --source include/have_innodb.inc
 
+# This test is slow on buildbot.
+--source include/big_test.inc
+
 disable_query_log;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 enable_query_log;

mysql-test/main/selectivity_innodb.test

 --source include/have_innodb.inc
+# This test is slow on buildbot.
+--source include/big_test.inc
 
 SET SESSION STORAGE_ENGINE='InnoDB';
 

mysql-test/main/subselect_sj.result

@@ -3197,6 +3197,7 @@ drop table t1,t2,t3;
 #
 # MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT
 #
+set @@optimizer_switch= @subselect_sj_tmp;
 create table t1 (a1 varchar(25));
 create table t2 (a2 varchar(25)) ;
 insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2);

mysql-test/main/subselect_sj.test

@@ -2880,6 +2880,8 @@ drop table t1,t2,t3;
 --echo # MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT
 --echo #
 
+set @@optimizer_switch= @subselect_sj_tmp;
+
 create table t1 (a1 varchar(25));
 create table t2 (a2 varchar(25)) ;
 insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2);

mysql-test/main/subselect_sj_jcl6.result

@@ -3211,6 +3211,7 @@ drop table t1,t2,t3;
 #
 # MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT
 #
+set @@optimizer_switch= @subselect_sj_tmp;
 create table t1 (a1 varchar(25));
 create table t2 (a2 varchar(25)) ;
 insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2);

mysql-test/main/trigger_null-8605.test

@@ -149,6 +149,7 @@ EOF
 load data infile 'mdev8605.txt' into table t1 fields terminated by ',';
 select * from t1;
 drop table t1;
+--remove_file $datadir/test/mdev8605.txt
 
 # timestamps (on NULL = NOW())
 create table t1 (a timestamp, b int auto_increment primary key);
@@ -218,6 +219,7 @@ load data infile 'sep8605.txt' into table t1 fields terminated by ','
    (@a,a2,a3,b,c) set a1=100-@a;
 select 100-a1,a2,a3,b,c from t1;
 delete from t1;
+--remove_file $datadir/test/sep8605.txt
 
 --write_file $datadir/test/fix8605.txt
 00012010-11-12 01:02:030010000000000000000
@@ -231,6 +233,7 @@ set statement timestamp=777777777 for
 load data infile 'fix8605.txt' into table t1 fields terminated by '';
 select * from t1;
 delete from t1;
+--remove_file $datadir/test/fix8605.txt
 
 --write_file $datadir/test/xml8605.txt
 <data>
@@ -300,6 +303,7 @@ set statement timestamp=777777777 for
 load xml infile 'xml8605.txt' into table t1 rows identified by '<row>';
 select * from t1;
 drop table t1;
+--remove_file $datadir/test/xml8605.txt
 
 # explicit DEFAULT
 create table t1 (a int not null default 5, b int, c int);

mysql-test/suite/encryption/r/corrupted_during_recovery.result

@@ -9,14 +9,11 @@ INSERT INTO t2 VALUES(2);
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'InnoDB'
 SELECT * FROM t1;
-a
-1
-2
+ERROR 42S02: Table 'test.t1' doesn't exist in engine
 SELECT * FROM t2;
 a
 2
-CHECK TABLE t1,t2;
+CHECK TABLE t2;
 Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
 test.t2	check	status	OK
 DROP TABLE t1, t2;

mysql-test/suite/encryption/r/innodb-force-corrupt.result

 call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)");
 call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version=");
-call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` is corrupted");
+call mtr.add_suppression("\\[ERROR\\] InnoDB: We detected index corruption in an InnoDB type table");
+call mtr.add_suppression("\\[ERROR\\] mysqld.*: Index for table 't2' is corrupt; try to repair it");
 SET GLOBAL innodb_file_per_table = ON;
 set global innodb_compression_algorithm = 1;
 # Create and populate tables to be corrupted
@@ -19,7 +20,7 @@ COMMIT;
 SELECT * FROM t1;
 ERROR 42S02: Table 'test.t1' doesn't exist in engine
 SELECT * FROM t2;
-ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
+Got one of the listed errors
 SELECT * FROM t3;
 ERROR 42S02: Table 'test.t3' doesn't exist in engine
 # Restore the original tables

mysql-test/suite/encryption/t/corrupted_during_recovery.combinations

+[strict_crc32]
+--innodb-checksum-algorithm=strict_crc32
+
+[strict_full_crc32]
+--innodb-checksum-algorithm=strict_full_crc32

mysql-test/suite/encryption/t/corrupted_during_recovery.test

@@ -11,6 +11,7 @@ call mtr.add_suppression("InnoDB: The page \\[page id: space=\\d+, page number=3
 call mtr.add_suppression("InnoDB: Table in tablespace \\d+ encrypted. However key management plugin or used key_version \\d+ is not found or used encryption algorithm or method does not match. Can't continue opening the table.");
 --enable_query_log
 
+let INNODB_CHECKSUM_ALGORITHM = `SELECT @@innodb_checksum_algorithm`;
 let INNODB_PAGE_SIZE=`select @@innodb_page_size`;
 CREATE TABLE t1(a BIGINT PRIMARY KEY) ENGINE=InnoDB, ENCRYPTED=YES;
 INSERT INTO t1 VALUES(1);
@@ -34,7 +35,8 @@ my $ps = $ENV{INNODB_PAGE_SIZE};
 my $file = "$ENV{MYSQLD_DATADIR}/test/t1.ibd";
 open(FILE, "+<$file") || die "Unable to open $file";
 binmode FILE;
-seek (FILE, $ENV{INNODB_PAGE_SIZE} * 3, SEEK_SET) or die "seek";
+my $offset = ($ENV{INNODB_CHECKSUM_ALGORITHM} =~ /full_crc32/) ? 26 : 0;
+seek (FILE, $ENV{INNODB_PAGE_SIZE} * 3 + $offset, SEEK_SET) or die "seek";
 print FILE "junk";
 close FILE or die "close";
 
@@ -51,11 +53,16 @@ EOF
 --source include/start_mysqld.inc
 --error ER_UNKNOWN_STORAGE_ENGINE
 SELECT * FROM t1;
-let $restart_parameters=--innodb_force_recovery=1;
+--disable_query_log
+call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=[1-9][0-9]*, page number=3\\] in file .*test.t[1].ibd looks corrupted; key_version=");
+call mtr.add_suppression("InnoDB: Table `test`\\.`t1` is corrupted. Please drop the table and recreate.");
+--enable_query_log
+let $restart_parameters=--innodb_force_recovery=1 --skip-innodb-buffer-pool-load-at-startup;
 --source include/restart_mysqld.inc
 
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM t1;
 SELECT * FROM t2;
-CHECK TABLE t1,t2;
+CHECK TABLE t2;
 
 DROP TABLE t1, t2;

mysql-test/suite/encryption/t/innodb-force-corrupt.test

@@ -9,7 +9,8 @@
 
 call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)");
 call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version=");
-call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` is corrupted");
+call mtr.add_suppression("\\[ERROR\\] InnoDB: We detected index corruption in an InnoDB type table");
+call mtr.add_suppression("\\[ERROR\\] mysqld.*: Index for table 't2' is corrupt; try to repair it");
 
 SET GLOBAL innodb_file_per_table = ON;
 set global innodb_compression_algorithm = 1;
@@ -69,7 +70,7 @@ EOF
 
 --error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM t1;
---error ER_GET_ERRMSG
+--error ER_GET_ERRMSG,ER_NOT_KEYFILE
 SELECT * FROM t2;
 --error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM t3;

mysql-test/suite/galera/disabled.def

@@ -33,7 +33,6 @@ galera_concurrent_ctas : MDEV-18180 Galera test failure on galera.galera_concurr
 galera_encrypt_tmp_files : Get error failed to enable encryption of temporary files
 galera_flush :  MariaDB does not have global.thread_statistics
 galera_gcache_recover_manytrx : MDEV-18834 Galera test failure
-galera_gcs_fc_limit : MDEV-17061 Timeout in wait_condition.inc for PROCESSLIST
 galera_ist_mariabackup : MDEV-18829 test leaves port open
 galera_ist_progress: MDEV-15236 fails when trying to read transfer status
 galera_kill_applier : race condition at the start of the test

mysql-test/suite/galera/r/MW-336.result

@@ -7,11 +7,13 @@ SET GLOBAL wsrep_slave_threads = 10;
 SET GLOBAL wsrep_slave_threads = 1;
 # Wait 10 slave threads to start 1
 connection node_2;
-# Generate 12 replication events
+SET SESSION wsrep_sync_wait=15;
+# Generate 100 replication events
 connection node_1;
+SET SESSION wsrep_sync_wait=15;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
-13
+101
 # Wait 9 slave threads to exit 1
 SET GLOBAL wsrep_slave_threads = 10;
 # Wait 10 slave threads to start 2
@@ -19,23 +21,21 @@ SET GLOBAL wsrep_slave_threads = 20;
 # Wait 20 slave threads to start 3
 SET GLOBAL wsrep_slave_threads = 1;
 connection node_2;
-# Generate 40 replication events
+# Generate 100 replication events
 connection node_1;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
-53
+201
 # Wait 10 slave threads to exit 3
 SET GLOBAL wsrep_slave_threads = 10;
-SET GLOBAL wsrep_slave_threads = 0;
-Warnings:
-Warning	1292	Truncated incorrect wsrep_slave_threads value: '0'
+SET GLOBAL wsrep_slave_threads = 1;
 # Wait 10 slave threads to start 3
 connection node_2;
-# Generate 12 replication events
+# Generate 100 replication events
 connection node_1;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
-65
+301
 # Wait 10 slave threads to exit 4
 connection node_1;
 DROP TABLE t1;

mysql-test/suite/galera/r/galera_gcs_fc_limit.result

 connection node_2;
 connection node_1;
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1);
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,B INTEGER) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,1);
 connection node_2;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SET SESSION wsrep_sync_wait=15;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
 1
 SET GLOBAL wsrep_provider_options = 'gcs.fc_limit=1';
 LOCK TABLE t1 WRITE;
 connection node_1;
-INSERT INTO t1 VALUES (2);
-INSERT INTO t1 VALUES (3);
-INSERT INTO t1 VALUES (4);
-INSERT INTO t1 VALUES (5);
+FLUSH STATUS;
+INSERT INTO t1 VALUES (2,2);
+INSERT INTO t1 VALUES (3,3);
+INSERT INTO t1 VALUES (4,4);
+INSERT INTO t1(B) SELECT B FROM t1;
 connection node_1a;
+# In node_1 either insert or commit should be stuck
 connection node_2;
 UNLOCK TABLES;
 connection node_1;
-INSERT INTO t1 VALUES (6);
+INSERT INTO t1 VALUES (NULL,6);
 connection node_2;
-SELECT COUNT(*) = 6 FROM t1;
-COUNT(*) = 6
-1
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+9
 DROP TABLE t1;

mysql-test/suite/galera/t/MW-336.test

@@ -19,13 +19,14 @@ SET GLOBAL wsrep_slave_threads = 1;
 --source include/wait_condition.inc
 
 --connection node_2
+SET SESSION wsrep_sync_wait=15;
 # Wait until inserts are replicated
 --let $wait_condition = SELECT COUNT(*) = 1 FROM t1;
 --source include/wait_condition.inc
---echo # Generate 12 replication events
+--echo # Generate 100 replication events
 --disable_query_log
 --disable_result_log
---let $count = 12
+--let $count = 100
 while ($count)
 {
   INSERT INTO t1 VALUES (1);
@@ -35,9 +36,7 @@ while ($count)
 --enable_query_log
 
 --connection node_1
-# Wait until inserts are replicated
---let $wait_condition = SELECT COUNT(*) = 13 FROM t1;
---source include/wait_condition.inc
+SET SESSION wsrep_sync_wait=15;
 
 SELECT COUNT(*) FROM t1;
 
@@ -61,10 +60,10 @@ SET GLOBAL wsrep_slave_threads = 20;
 SET GLOBAL wsrep_slave_threads = 1;
 
 --connection node_2
---echo # Generate 40 replication events
+--echo # Generate 100 replication events
 --disable_query_log
 --disable_result_log
---let $count = 40
+--let $count = 100
 while ($count)
 {
   INSERT INTO t1 VALUES (1);
@@ -74,11 +73,6 @@ while ($count)
 --enable_result_log
 
 --connection node_1
-
-# Wait until inserts are replicated
---let $wait_condition = SELECT COUNT(*) = 53 FROM t1;
---source include/wait_condition.inc
-
 SELECT COUNT(*) FROM t1;
 
 --echo # Wait 10 slave threads to exit 3
@@ -87,7 +81,7 @@ SELECT COUNT(*) FROM t1;
 --source include/wait_condition.inc
 
 SET GLOBAL wsrep_slave_threads = 10;
-SET GLOBAL wsrep_slave_threads = 0;
+SET GLOBAL wsrep_slave_threads = 1;
 
 --echo # Wait 10 slave threads to start 3
 --let $wait_timeout=600
@@ -95,10 +89,10 @@ SET GLOBAL wsrep_slave_threads = 0;
 --source include/wait_condition.inc
 
 --connection node_2
---echo # Generate 12 replication events
+--echo # Generate 100 replication events
 --disable_query_log
 --disable_result_log
---let $count = 12
+--let $count = 100
 while ($count)
 {
   INSERT INTO t1 VALUES (1);
@@ -108,10 +102,6 @@ while ($count)
 --enable_query_log
 
 --connection node_1
-# Wait until inserts are replicated
---let $wait_condition = SELECT COUNT(*) = 65 FROM t1;
---source include/wait_condition.inc
-
 SELECT COUNT(*) FROM t1;
 
 --echo # Wait 10 slave threads to exit 4

mysql-test/suite/galera/t/galera_gcs_fc_limit.test

@@ -5,12 +5,12 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1);
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,B INTEGER) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,1);
 
 --connection node_2
-SELECT COUNT(*) = 1 FROM t1;
---sleep 1
+SET SESSION wsrep_sync_wait=15;
+SELECT COUNT(*) FROM t1;
 
 --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options`
 SET GLOBAL wsrep_provider_options = 'gcs.fc_limit=1';
@@ -19,24 +19,22 @@ SET GLOBAL wsrep_provider_options = 'gcs.fc_limit=1';
 LOCK TABLE t1 WRITE;
 
 --connection node_1
---sleep 1
-INSERT INTO t1 VALUES (2);
---sleep 2
-INSERT INTO t1 VALUES (3);
---sleep 2
-INSERT INTO t1 VALUES (4);
---sleep 2
+FLUSH STATUS;
+INSERT INTO t1 VALUES (2,2);
+INSERT INTO t1 VALUES (3,3);
+INSERT INTO t1 VALUES (4,4);
 
 # This query will hang because flow control will kick in
 --send
-INSERT INTO t1 VALUES (5);
---sleep 2
+INSERT INTO t1(B) SELECT B FROM t1;
 
 --let $galera_connection_name = node_1a
 --let $galera_server_number = 1
 --source include/galera_connect.inc
 --connection node_1a
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Commit' AND INFO = 'INSERT INTO t1 VALUES (5)';
+
+--echo # In node_1 either insert or commit should be stuck
+--let $wait_condition = SELECT VARIABLE_VALUE > 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_flow_control_paused';
 --source include/wait_condition.inc
 
 --connection node_2
@@ -46,11 +44,11 @@ UNLOCK TABLES;
 --connection node_1
 --reap
 
-INSERT INTO t1 VALUES (6);
+INSERT INTO t1 VALUES (NULL,6);
 
 --connection node_2
 # Replication catches up and continues normally
-SELECT COUNT(*) = 6 FROM t1;
+SELECT COUNT(*) FROM t1;
 
 --disable_query_log
 --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_orig';

mysql-test/suite/galera_3nodes/r/galera_evs_suspect_timeout.result

 connection node_2;
 connection node_1;
 connection node_1;
+connection node_2;
+connection node_3;
+connection node_1;
 SET GLOBAL wsrep_provider_options = 'evs.inactive_timeout=PT100M; evs.suspect_timeout=PT1S';
 connection node_2;
 SET GLOBAL wsrep_provider_options = 'evs.inactive_timeout=PT100M; evs.suspect_timeout=PT1S';
 connection node_3;
 Suspending node ...
 connection node_1;
-SET SESSION wsrep_sync_wait = 0;
+SET SESSION wsrep_sync_wait=0;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 2
 1
-CREATE TABLE t1 (f1 INTEGER);
+CREATE TABLE t1 (f1 INTEGER) engine=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
-SET SESSION wsrep_sync_wait = 0;
+SET SESSION wsrep_sync_wait=0;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 2
 1
-SET SESSION wsrep_sync_wait = DEFAULT;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SET SESSION wsrep_sync_wait = 15;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
 1
-DROP TABLE t1;
 connection node_3;
 Resuming node ...
-CALL mtr.add_suppression("WSREP: gcs_caused() returned -1 \\(Operation not permitted\\)");
+CALL mtr.add_suppression("WSREP: gcs_caused");
+CALL mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg");
+SET SESSION wsrep_sync_wait = 15;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
+connection node_1;
+DROP TABLE t1;

mysql-test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test

@@ -7,24 +7,28 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+--let $galera_connection_name = node_3
+--let $galera_server_number = 3
+--source include/galera_connect.inc
+--let $wsrep_cluster_address_node3 = `SELECT @@wsrep_cluster_address`
+
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--let $node_3=node_3
+--source ../galera/include/auto_increment_offset_save.inc
+
 --connection node_1
 --let $wsrep_provider_options_node1 = `SELECT @@wsrep_provider_options`
 SET GLOBAL wsrep_provider_options = 'evs.inactive_timeout=PT100M; evs.suspect_timeout=PT1S';
 
 --connection node_2
---source include/wait_until_connected_again.inc
 --let $wsrep_provider_options_node2 = `SELECT @@wsrep_provider_options`
 SET GLOBAL wsrep_provider_options = 'evs.inactive_timeout=PT100M; evs.suspect_timeout=PT1S';
 
---let $galera_connection_name = node_3
---let $galera_server_number = 3
---source include/galera_connect.inc
---connection node_3
---source include/wait_until_connected_again.inc
---let $wsrep_cluster_address_node3 = `SELECT @@wsrep_cluster_address`
-
 # Suspend node #3
 
+--connection node_3
 --source include/galera_suspend.inc
 --sleep 5
 
@@ -32,27 +36,27 @@ SET GLOBAL wsrep_provider_options = 'evs.inactive_timeout=PT100M; evs.suspect_ti
 
 --connection node_1
 --source include/wait_until_connected_again.inc
-SET SESSION wsrep_sync_wait = 0;
+SET SESSION wsrep_sync_wait=0;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 --disable_query_log
 --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_node1';
 --enable_query_log
-
 --source include/wait_until_connected_again.inc
-CREATE TABLE t1 (f1 INTEGER);
+
+CREATE TABLE t1 (f1 INTEGER) engine=InnoDB;
 INSERT INTO t1 VALUES (1);
 
 --connection node_2
-SET SESSION wsrep_sync_wait = 0;
+--source include/wait_until_connected_again.inc
+SET SESSION wsrep_sync_wait=0;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 --disable_query_log
 --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_node2';
 --enable_query_log
-
 --source include/wait_until_connected_again.inc
-SET SESSION wsrep_sync_wait = DEFAULT;
-SELECT COUNT(*) = 1 FROM t1;
-DROP TABLE t1;
+
+SET SESSION wsrep_sync_wait = 15;
+SELECT COUNT(*) FROM t1;
 
 # Reconnect node #3 so that MTR's end-of-test checks can run
 
@@ -65,4 +69,13 @@ DROP TABLE t1;
 --enable_query_log
 --source include/galera_wait_ready.inc
 
-CALL mtr.add_suppression("WSREP: gcs_caused() returned -1 \\(Operation not permitted\\)");
+CALL mtr.add_suppression("WSREP: gcs_caused");
+CALL mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg");
+
+SET SESSION wsrep_sync_wait = 15;
+SELECT COUNT(*) FROM t1;
+
+--connection node_1
+DROP TABLE t1;
+# Restore original auto_increment_offset values.
+--source ../galera/include/auto_increment_offset_restore.inc

mysql-test/suite/innodb/include/innodb-page-compression.inc

+# This test is slow on buildbot.
+--source include/big_test.inc
 create table innodb_normal (c1 int not null auto_increment primary key, b char(200)) engine=innodb;
 create table innodb_page_compressed1 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=1;
 create table innodb_page_compressed2 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=2;

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

@@ -9,14 +9,11 @@ INSERT INTO t2 VALUES(1);
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'InnoDB'
 SELECT * FROM t1;
-a
-0
-2
+ERROR 42S02: Table 'test.t1' doesn't exist in engine
 SELECT * FROM t2;
 a
 1
-CHECK TABLE t1,t2;
+CHECK TABLE t2;
 Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
 test.t2	check	status	OK
 DROP TABLE t1, t2;

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

@@ -29,8 +29,10 @@ ERROR HY000: Error on rename of './test/t1' to './test/t3' (errno: 165 "Table is
 truncate table t1;
 ERROR HY000: Table 't1' is read only
 drop table t1;
+ERROR HY000: Table 't1' is read only
 show tables;
 Tables_in_test
+t1
 t2
 # Restart the server with innodb_force_recovery as 5.
 # restart: --innodb-force-recovery=5
@@ -47,18 +49,21 @@ drop index idx on t2;
 ERROR HY000: Can't create table `test`.`t2` (errno: 165 "Table is read only")
 update t2 set f1=3 where f2=2;
 ERROR HY000: Running in read-only mode
-create table t1(f1 int not null)engine=innodb;
-ERROR HY000: Can't create table `test`.`t1` (errno: 165 "Table is read only")
-drop table t1;
-ERROR 42S02: Unknown table 'test.t1'
+create table t3(f1 int not null)engine=innodb;
+ERROR HY000: Can't create table `test`.`t3` (errno: 165 "Table is read only")
+drop table t3;
+ERROR 42S02: Unknown table 'test.t3'
 rename table t2 to t3;
 ERROR HY000: Error on rename of './test/t2' to './test/t3' (errno: 165 "Table is read only")
 truncate table t2;
 ERROR HY000: Table 't2' is read only
 drop table t2;
 ERROR HY000: Table 't2' is read only
+create schema db;
+drop schema db;
 show tables;
 Tables_in_test
+t1
 t2
 # Restart the server with innodb_force_recovery as 6.
 # restart: --innodb-force-recovery=6
@@ -75,10 +80,10 @@ drop index idx on t2;
 ERROR HY000: Table 't2' is read only
 update t2 set f1=3 where f2=2;
 ERROR HY000: Table 't2' is read only
-create table t1(f1 int not null)engine=innodb;
-ERROR HY000: Can't create table `test`.`t1` (errno: 165 "Table is read only")
+create table t3(f1 int not null)engine=innodb;
+ERROR HY000: Can't create table `test`.`t3` (errno: 165 "Table is read only")
 drop table t1;
-ERROR 42S02: Unknown table 'test.t1'
+ERROR HY000: Table 't1' is read only
 rename table t2 to t3;
 ERROR HY000: Error on rename of './test/t2' to './test/t3' (errno: 165 "Table is read only")
 truncate table t2;
@@ -87,6 +92,7 @@ drop table t2;
 ERROR HY000: Table 't2' is read only
 show tables;
 Tables_in_test
+t1
 t2
 # Restart the server with innodb_force_recovery=2
 # restart: --innodb-force-recovery=2
@@ -96,10 +102,9 @@ f1	f2
 begin;
 update t2 set f2=3;
 connect  con1,localhost,root,,;
-create table t3(a int)engine=innodb;
 # Force a redo log flush of the above uncommitted UPDATE
 SET GLOBAL innodb_flush_log_at_trx_commit=1;
-drop table t3;
+drop table t1;
 disconnect con1;
 connection default;
 # Kill the server

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

+CREATE TABLE t1 (pk INT PRIMARY KEY, c CHAR(255))ENGINE=InnoDB STATS_PERSISTENT=0;
+SET GLOBAL INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG = 2;
+INSERT INTO t1 VALUES(1, 'sql'), (2, 'server'), (3, 'mariadb'),
+(4, 'mariadb'), (5, 'test1'), (6, 'test2'), (7, 'test3'),
+(8, 'test4'), (9, 'test5'), (10, 'test6'), (11, 'test7'),
+(12, 'test8');
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+12
+UPDATE t1 SET c='best8' WHERE pk=12;
+# Kill the server
+# Corrupt the pages
+SELECT * FROM t1 WHERE PK = 1;
+ERROR 42000: Unknown storage engine 'InnoDB'
+SELECT * FROM t1 WHERE PK = 1;
+pk	c
+1	sql
+SELECT * FROM t1 WHERE pk = 12;
+ERROR HY000: Index for table 't1' is corrupt; try to repair it
+DROP TABLE t1;

mysql-test/suite/innodb/t/corrupted_during_recovery.opt

---innodb_doublewrite=0
+--skip-innodb-doublewrite
+--skip-innodb-buffer-pool-load-at-startup

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

@@ -6,6 +6,8 @@ call mtr.add_suppression("Plugin 'InnoDB' init function returned error");
 call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed");
 call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed file read of tablespace test/t1 page");
 call mtr.add_suppression("InnoDB: Failed to read file '.*test.t1\\.ibd' at offset 3: Page read from tablespace is corrupted.");
+call mtr.add_suppression("InnoDB: Background Page read failed to read or decrypt \\[page id: space=\\d+, page number=3\\]");
+call mtr.add_suppression("InnoDB: Table `test`.`t1` is corrupted. Please drop the table and recreate.");
 --enable_query_log
 
 let INNODB_PAGE_SIZE=`select @@innodb_page_size`;
@@ -54,8 +56,10 @@ EOF
 SELECT * FROM t1;
 let $restart_parameters=--innodb_force_recovery=1;
 --source include/restart_mysqld.inc
+
+--error ER_NO_SUCH_TABLE_IN_ENGINE
 SELECT * FROM t1;
 SELECT * FROM t2;
-CHECK TABLE t1,t2;
+CHECK TABLE t2;
 
 DROP TABLE t1, t2;

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

@@ -7,6 +7,8 @@
 --source include/innodb_page_size.inc
 --source include/have_debug.inc
 --source include/not_embedded.inc
+# This test is slow on buildbot.
+--source include/big_test.inc
 
 # Slow shutdown and restart to make sure ibuf merge is finished
 SET GLOBAL innodb_fast_shutdown = 0;