MDEV-7635: Part 110.2-mdev7635

innodb_buffer_pool_dump_at_shutdown = ON
innodb_buffer_pool_dump_pct         = 25
innodb_buffer_pool_load_at_startup  = ON
innodb_checksum_algorithm           = CRC32
innodb_file_format                  = Barracuda
innodb_file_format_max              = Barracuda
innodb_large_prefix                 = ON
innodb_log_compressed_pages         = ON
innodb_log_file_size                = 128M
innodb_purge_threads                = 4
innodb_stats_traditional            = OFF
innodb_strict_mode                  = ON
binlog_annotate_row_events          = ON
binlog_format                       = MIXED
group_concat_max_len                = 1M
histogram_size                      = 255
long-query-time                     = 2
lower_case_table_names              = 2
max_allowed_packet                  = 16M
replicate_annotate_row_events       = ON
slave_net_timeout                   = 60
sync_binlog                         = 1
use_stat_tables                     = complementary
aria_recover                        = FORCE,BACKUP
myisam_recover_options              = FORCE,BACKUP

8 files changed, 45 insertions, 2 deletions

diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test
index bdd295d0fa9..44b9ad53062 100644
--- a/mysql-test/t/func_gconcat.test
+++ b/mysql-test/t/func_gconcat.test
@@ -861,7 +861,7 @@ CREATE TABLE t2 SELECT GROUP_CONCAT(UPPER(f1) ORDER BY f2) FROM t1;
 SHOW CREATE TABLE t2;
 DROP TABLE t2;
 
-SET group_concat_max_len= DEFAULT;
+SET group_concat_max_len= 1024;
 SELECT LENGTH(GROUP_CONCAT(f1 ORDER BY f2)) FROM t1;
 
 SET group_concat_max_len= 499999;
diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test
index a3a1278ef1e..fc67a0412d5 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/t/join_outer.test
@@ -1368,6 +1368,10 @@ drop table t1,t2,t3,t4;
 --echo # Bug#57024: Poor performance when conjunctive condition over the outer 
 --echo #            table is used in the on condition of an outer join
 --echo # 
+let $use_stat_tables_saved= `SELECT @@session.use_stat_tables`;
+--disable_query_log
+SET SESSION use_stat_tables=never;
+--enable_query_log
 
 create table t1 (a int);
 insert into t1 values (NULL), (NULL), (NULL), (NULL);
@@ -1410,6 +1414,10 @@ show status like "handler_read%";
 
 drop table t1,t2,t3;
 
+--disable_query_log
+eval SET SESSION use_stat_tables=$use_stat_tables_saved;
+--enable_query_log
+
 --echo #
 --echo # Bug#57688 Assertion `!table || (!table->write_set || bitmap_is_set(table->write_set, field
 --echo #
diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test
index 62a9173b526..97130eb1a84 100644
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/t/partition_innodb.test
@@ -825,6 +825,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (f1 VARCHAR(512) CHARACTER SET utf8) ENGINE=InnoDB;
 INSERT INTO t1 VALUES ('j');
 
+--error ER_INDEX_COLUMN_TOO_LONG
 CREATE TABLE t2 (
   f2 VARCHAR(5) CHARACTER SET latin1,
   f3 VARCHAR(5) CHARACTER SET utf8,
@@ -840,6 +841,22 @@ CREATE TABLE t2 (
     PARTITION p1 VALUES IN (2,4,0)
 );
 
+CREATE TABLE t2 (
+  f2 VARCHAR(5) CHARACTER SET latin1,
+  f3 VARCHAR(5) CHARACTER SET utf8,
+  f4 INT,
+  f5 VARCHAR(512) CHARACTER SET utf8,
+  f6 VARCHAR(256) CHARACTER SET utf8,
+  key (f2),
+  key (f3),
+  key (f5)
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC
+  PARTITION BY LIST COLUMNS (f4)
+  SUBPARTITION BY KEY(f6) SUBPARTITIONS 4 (
+    PARTITION p0 VALUES IN (1,3,9,null),
+    PARTITION p1 VALUES IN (2,4,0)
+);
+
 INSERT INTO t2 VALUES  
   ('k','s',3,'b','j'),('a','b',NULL,'v','j'),('c','m',9,'t',NULL),
   ('b','l',9,'b',NULL),('i','y',3,'o','w'),('c','m',NULL,'a','m'),  
diff --git a/mysql-test/t/set_statement_notembedded_binlog.test b/mysql-test/t/set_statement_notembedded_binlog.test
index 62c351ed6f7..b0c00008d4f 100644
--- a/mysql-test/t/set_statement_notembedded_binlog.test
+++ b/mysql-test/t/set_statement_notembedded_binlog.test
@@ -1,5 +1,6 @@
 --source include/have_log_bin.inc
 --source include/not_embedded.inc
+--source include/have_binlog_format_statement.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/t/stat_tables.test b/mysql-test/t/stat_tables.test
index 4cbaa9e27c8..5df9d0000bc 100644
--- a/mysql-test/t/stat_tables.test
+++ b/mysql-test/t/stat_tables.test
@@ -6,6 +6,7 @@ select @@session.use_stat_tables;
 set @save_use_stat_tables=@@use_stat_tables;
 
 set use_stat_tables='preferably';
+set histogram_size=0;
 
 --disable_warnings
 DROP DATABASE IF EXISTS dbt3_s001;
diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test
index e0b0d9c8838..dbe0cb6d0c2 100644
--- a/mysql-test/t/status.test
+++ b/mysql-test/t/status.test
@@ -352,7 +352,7 @@ DROP FUNCTION f1;
 #
 # Test of internal temporary table status variables
 #
-
+SET SESSION use_stat_tables = never;
 flush status;
 create table t1 (a int not null auto_increment primary key, g int, b blob);
 insert into t1 (g,b) values (1,'a'), (2, 'b'), (3, 'b'), (1, 'c');
@@ -363,6 +363,7 @@ show status like 'Row%';
 show status like 'Handler%';
 show status like '%tmp%';
 drop table t1;
+SET SESSION use_stat_tables = default;
 
 #
 # Test of handler status counts
diff --git a/mysql-test/t/subselect_sj_mat.test b/mysql-test/t/subselect_sj_mat.test
index d2bafa86028..19fc332e2af 100644
--- a/mysql-test/t/subselect_sj_mat.test
+++ b/mysql-test/t/subselect_sj_mat.test
@@ -1861,6 +1861,11 @@ drop table t1;
 --echo #
 --echo # MDEV-7220: Materialization strategy is not used for REPLACE ... SELECT
 --echo #
+let $use_stat_tables_saved= `SELECT @@session.use_stat_tables`;
+--disable_query_log
+SET SESSION use_stat_tables=never;
+--enable_query_log
+
 create table t0(a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
@@ -1900,6 +1905,9 @@ select * from t1 where (a,b) in (select max(a),b from t2 group by b);
 show status where Variable_name like 'Handler_read%' or  Variable_name like 'Handler_%write%';
 
 drop table t0,t1,t2,t3;
+--disable_query_log
+eval SET SESSION use_stat_tables=$use_stat_tables_saved;
+--enable_query_log
 
 --echo #
 --echo # MDEV-7971: Assertion `name != __null' failed in ACL_internal_schema_registry::lookup 
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index a02dce34837..6e29761d0ba 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -2410,6 +2410,10 @@ USE test;
 #
 # Test that using a trigger will not open mysql.proc
 #
+let $use_stat_tables_saved= `SELECT @@session.use_stat_tables`;
+--disable_query_log
+SET SESSION use_stat_tables=never;
+--enable_query_log
 create table t1 (i int);
 create table t2 (i int);
 flush tables;
@@ -2428,6 +2432,9 @@ show status like 'Opened_tables';
 select * from t1;
 select * from t2;
 drop table t1,t2;
+--disable_query_log
+eval SET SESSION use_stat_tables=$use_stat_tables_saved;
+--enable_query_log
 
 --echo End of 5.2 tests.