Merge 10.2 into bb-10.2-ext

Author: dr-m

README.md

@@ -17,7 +17,7 @@ see the Credits appendix.  You can also run 'SHOW authors' to get a
 list of active contributors.
 
 A description of the MariaDB project and a manual can be found at:
-http://mariadb.org/
+https://mariadb.org/
 https://mariadb.com/kb/en/
 https://mariadb.com/kb/en/mariadb-vs-mysql-features/
 https://mariadb.com/kb/en/mariadb-versus-mysql-features/
@@ -55,9 +55,9 @@ Bug Reports:
 ------------
 
 Bug and/or error reports regarding MariaDB should be submitted at
-http://mariadb.org/jira
+https://mariadb.org/jira
 
-Bugs in the MySQL code can also be submitted at http://bugs.mysql.com
+Bugs in the MySQL code can also be submitted at https://bugs.mysql.com
 
 The code for MariaDB, including all revision history, can be found at:
 https://github.com/MariaDB/server

mysql-test/r/explain_json.result

@@ -1525,12 +1525,12 @@ ANALYZE
         "key_length": "5",
         "used_key_parts": ["a"],
         "ref": ["test.t3.a"],
-        "r_loops": 0,
+        "r_loops": 1,
         "rows": 1,
-        "r_rows": null,
+        "r_rows": 10,
         "r_total_time_ms": "REPLACED",
         "filtered": 100,
-        "r_filtered": null,
+        "r_filtered": 100,
         "index_condition_bka": "t4.b + 1 <= t3.b + 1"
       },
       "buffer_type": "flat",

mysql-test/suite/innodb/r/innodb-table-online.result

@@ -167,7 +167,8 @@ ROLLBACK;
 connection con1;
 KILL QUERY @id;
 ERROR 70100: Query execution was interrupted
-SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR kill_done';
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done';
+SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done';
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 # session default
 connection default;
@@ -180,6 +181,10 @@ ddl_online_create_index	1
 ddl_pending_alter_table	1
 ddl_sort_file_alter_table	0
 ddl_log_file_alter_table	0
+BEGIN;
+INSERT INTO t1 VALUES(7,4,2);
+ROLLBACK;
+SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied';
 KILL QUERY @id;
 SET DEBUG_SYNC = 'now SIGNAL kill_done';
 # session con1
@@ -227,6 +232,7 @@ t1	CREATE TABLE `t1` (
   `c3` char(255) NOT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done';
 SET lock_wait_timeout = 10;
 ALTER TABLE t1 ROW_FORMAT=COMPACT, ALGORITHM = INPLACE;

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

@@ -1,6 +1,9 @@
 #
 # Bug #23070734	CONCURRENT TRUNCATE TABLES CAUSE STALLS
 #
+SET @ahi= @@global.innodb_adaptive_hash_index;
+SET GLOBAL innodb_adaptive_hash_index=OFF;
+SET GLOBAL innodb_adaptive_hash_index=ON;
 Test_1 :- Check if DDL operations are possible on
 table being truncated. Also check if
 DDL operations on other tables succeed.
@@ -81,6 +84,5 @@ connection con2;
 disconnect con2;
 connection default;
 SET DEBUG_SYNC= 'RESET';
-SET session lock_wait_timeout=default;
-set global innodb_adaptive_hash_index=on;
+SET GLOBAL innodb_adaptive_hash_index=@ahi;
 drop table t1,t2,t3;

mysql-test/suite/innodb/t/innodb-table-online.test

@@ -158,14 +158,19 @@ let $ID= `SELECT @id := CONNECTION_ID()`;
 --error ER_QUERY_INTERRUPTED
 KILL QUERY @id;
 
-SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR kill_done';
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done';
+SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done';
 --send
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 
 --echo # session default
 connection default;
 SET DEBUG_SYNC = 'now WAIT_FOR rebuilt';
 eval $innodb_metrics_select;
+BEGIN;
+INSERT INTO t1 VALUES(7,4,2);
+ROLLBACK;
+SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied';
 let $ignore= `SELECT @id := $ID`;
 KILL QUERY @id;
 SET DEBUG_SYNC = 'now SIGNAL kill_done';
@@ -201,6 +206,7 @@ WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
 --echo # session con1
 connection con1;
 SHOW CREATE TABLE t1;
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 
 # Exceed the configured innodb_online_alter_log_max_size.
 # The actual limit is a multiple of innodb_sort_buf_size,

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

@@ -8,6 +8,12 @@
 --echo # Bug #23070734	CONCURRENT TRUNCATE TABLES CAUSE STALLS
 --echo #
 
+SET @ahi= @@global.innodb_adaptive_hash_index;
+# Ensure that there is no adaptive hash index on any system tables,
+# or any other tables than the ones that we are creating below.
+SET GLOBAL innodb_adaptive_hash_index=OFF;
+SET GLOBAL innodb_adaptive_hash_index=ON;
+
 --echo Test_1 :- Check if DDL operations are possible on
 --echo		 table being truncated. Also check if
 --echo		 DDL operations on other tables succeed.
@@ -115,8 +121,7 @@ disconnect con2;
 connection default;
 SET DEBUG_SYNC= 'RESET';
 
-SET session lock_wait_timeout=default;
-set global innodb_adaptive_hash_index=on;
+SET GLOBAL innodb_adaptive_hash_index=@ahi;
 
 drop table t1,t2,t3;
 --source include/wait_until_count_sessions.inc

mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled

@@ -662,7 +662,7 @@
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
 -GLOBAL_VALUE	5.6.37
-+GLOBAL_VALUE	5.6.36-82.1
++GLOBAL_VALUE	5.6.36-82.2
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	NULL
  VARIABLE_SCOPE	GLOBAL