Merge 10.5 to 10.6

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

@@ -15,6 +15,11 @@ if (!$INNOCHECKSUM) {
   --die Need innochecksum binary
 }
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 let $checksum_algorithm = `SELECT @@innodb_checksum_algorithm`;
 SET GLOBAL innodb_file_per_table = ON;
 # zlib

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

@@ -1,5 +1,9 @@
 # This test is slow on buildbot.
 --source include/big_test.inc
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
 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/t/innodb-page_compression_bzip2.test

@@ -2,6 +2,11 @@
 -- source include/have_innodb_bzip2.inc
 -- source include/not_embedded.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # bzip2
 set global innodb_compression_algorithm = 5;
 

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

@@ -4,6 +4,11 @@
 # The test can take very long time with valgrind
 --source include/not_valgrind.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # lz4
 set global innodb_compression_algorithm = 2;
 

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

@@ -2,6 +2,11 @@
 -- source include/have_innodb_lzma.inc
 -- source include/not_embedded.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # lzma
 set global innodb_compression_algorithm = 4;
 

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

@@ -2,6 +2,11 @@
 -- source include/have_innodb_lzo.inc
 -- source include/not_embedded.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # lzo
 set global innodb_compression_algorithm = 3;
 

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

@@ -2,6 +2,10 @@
 --source include/not_embedded.inc
 
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
 
 # zlib
 set global innodb_compression_algorithm = 1;

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

@@ -3,6 +3,11 @@
 # This test is slow on buildbot.
 --source include/big_test.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # zlib
 set global innodb_compression_algorithm = 1;
 

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

@@ -6,6 +6,9 @@
 
 --disable_query_log
 call mtr.add_suppression("InnoDB: Difficult to find free blocks in the buffer pool");
+--disable_query_log
+# This may be triggered on a slow system.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
 --enable_query_log
 
 SET GLOBAL innodb_undo_log_truncate = 0;

mysql-test/suite/perfschema/include/program_nested_setup.inc

@@ -3,7 +3,6 @@
 #
 
 --source include/no_protocol.inc
---source include/have_innodb.inc
 
 --echo # SET-UP
 CREATE DATABASE nested_sp;
@@ -17,7 +16,7 @@ CREATE TABLE t1(
 CREATE TABLE t2(
   n INT UNSIGNED NOT NULL, 
   f BIGINT UNSIGNED
-) engine=innodb;
+);
 
 --echo ############################
 --echo # Creating Stored Programs #

mysql-test/suite/perfschema/r/max_program_zero.result

@@ -167,7 +167,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-) engine=innodb;
+);
 ############################
 # Creating Stored Programs #
 ############################

mysql-test/suite/perfschema/r/statement_program_lost_inst.result

@@ -167,7 +167,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-) engine=innodb;
+);
 ############################
 # Creating Stored Programs #
 ############################

mysql-test/suite/perfschema/r/statement_program_nested.result

@@ -13,7 +13,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-) engine=innodb;
+);
 ############################
 # Creating Stored Programs #
 ############################
@@ -67,6 +67,7 @@ END WHILE;
 END|
 CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
 CALL ifac(10)|
+ALTER TABLE t2 ENGINE=InnoDB;
 #####################
 # Executing queries #
 #####################
@@ -1199,7 +1200,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-) engine=innodb;
+);
 ############################
 # Creating Stored Programs #
 ############################

mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result

@@ -101,6 +101,7 @@ CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
 SET @del:= @del + 1|
 CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW 
 SET @del:= @del + 8 + old.j|
+ALTER TABLE t2 ENGINE=InnoDB;
 #####################
 # Executing queries #
 #####################
@@ -159,6 +160,7 @@ WHERE CURRENT_SCHEMA='stored_programs' AND
 ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT;
 EVENT_NAME	SQL_TEXT	OBJECT_NAME	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
 statement/scheduler/event	NULL	NULL	NULL	0
+statement/sql/alter_table	ALTER TABLE t2 ENGINE=InnoDB	NULL	NULL	0
 statement/sql/call_procedure	CALL SampleProc1(30,40,50)	NULL	NULL	0
 statement/sql/call_procedure	CALL SampleProc2("Jwalamukhi",34)	NULL	NULL	0
 statement/sql/call_procedure	CALL SampleProc3()	NULL	NULL	0
@@ -375,7 +377,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-) engine=innodb;
+);
 ############################
 # Creating Stored Programs #
 ############################
@@ -429,6 +431,7 @@ END WHILE;
 END|
 CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
 CALL ifac(10)|
+ALTER TABLE t2 ENGINE=InnoDB;
 #####################
 # Executing queries #
 #####################

mysql-test/suite/perfschema/t/statement_program_nested.test

@@ -4,6 +4,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/have_innodb.inc
 
 TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
 TRUNCATE TABLE performance_schema.events_statements_history_long;
@@ -13,6 +14,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
 --echo #################################################
 
 --source suite/perfschema/include/program_nested_setup.inc
+ALTER TABLE t2 ENGINE=InnoDB;
 --source suite/perfschema/include/program_nested_execution.inc
 
 SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,

mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test

@@ -7,6 +7,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/have_innodb.inc
 
 TRUNCATE TABLE performance_schema.events_statements_history_long;
 
@@ -14,6 +15,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
 --echo # Non-nested Stored programs.
 --echo #----------------------------
 --source suite/perfschema/include/program_setup.inc
+ALTER TABLE t2 ENGINE=InnoDB;
 --source suite/perfschema/include/program_execution.inc
 
 SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
@@ -31,6 +33,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
 --echo # Nested stored programs.
 --echo #------------------------
 --source suite/perfschema/include/program_nested_setup.inc
+ALTER TABLE t2 ENGINE=InnoDB;
 --source suite/perfschema/include/program_nested_execution.inc
 
 SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL

mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result

@@ -4,6 +4,11 @@ SELECT @orig;
 25
 SET GLOBAL innodb_buffer_pool_dump_pct=3;
 # Do the dump
+SELECT @@global.innodb_buffer_pool_dump_now;
+SELECT variable_value INTO @old_dump_status FROM information_schema.global_status
+WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
+SET GLOBAL innodb_buffer_pool_dump_now = ON;
+SELECT @@global.innodb_buffer_pool_dump_now;
 SET GLOBAL innodb_buffer_pool_dump_pct=20;
 SELECT @@global.innodb_buffer_pool_dump_pct;
 @@global.innodb_buffer_pool_dump_pct

mysql-test/suite/versioning/common.inc

@@ -1,9 +1,9 @@
---disable_query_log
 if (!$TEST_VERSIONING_SO)
 {
   --skip needs test_versioning plugin
 }
 source include/have_innodb.inc;
+--disable_query_log
 
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from mysql.transaction_registry;