Merge 10.6 into 10.7

3 years ago · 08e2c98ec8
10 changed files with 10 additions and 4 deletions
--- a/mysql-test/main/order_by_innodb.result
+++ b/mysql-test/main/order_by_innodb.result
@ -154,7 +154,7 @@ id2 int NOT NULL,
 d1 datetime,
 d2 timestamp NOT NULL,
 KEY id2 (id2)
-) engine=innodb;
+) engine=innodb stats_persistent=0;
 insert into t2 values
 (1,2,'2019-03-05 00:00:00','2019-03-06 00:00:00'),
 (2,3,'2019-03-05 00:00:00','2019-03-06 00:00:00'),
--- a/mysql-test/main/order_by_innodb.test
+++ b/mysql-test/main/order_by_innodb.test
@ -141,7 +141,7 @@ CREATE TABLE t2 (
  d1 datetime,
  d2 timestamp NOT NULL,
  KEY id2 (id2)
-) engine=innodb;
+) engine=innodb stats_persistent=0;

 insert into t2 values
  (1,2,'2019-03-05 00:00:00','2019-03-06 00:00:00'),
--- a/mysql-test/suite/innodb/t/alter_dml_apply.test
+++ b/mysql-test/suite/innodb/t/alter_dml_apply.test
@ -2,6 +2,7 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 --source include/have_sequence.inc
+--source include/no_valgrind_without_big.inc

 CREATE TABLE t1(f1 INT NOT NULL, f2 INT NOT NULL,
 		f3 CHAR(200), f4 CHAR(200),
--- a/mysql-test/suite/innodb/t/import_corrupted.test
+++ b/mysql-test/suite/innodb/t/import_corrupted.test
@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc

 call mtr.add_suppression("Table `test`.`t2` should have 2 indexes but the tablespace has 1 indexes");
 call mtr.add_suppression("Index for table 't2' is corrupt; try to repair it");
--- a/mysql-test/suite/innodb/t/innodb_scrub.test
+++ b/mysql-test/suite/innodb/t/innodb_scrub.test
@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/no_valgrind_without_big.inc

 let $MYSQLD_DATADIR=`select @@datadir`;
 CREATE TABLE t1(f1 int auto_increment primary key,
--- a/mysql-test/suite/mariabackup/big_innodb_log.test
+++ b/mysql-test/suite/mariabackup/big_innodb_log.test
@ -5,6 +5,7 @@
 # recovery process with such numbers.
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/no_valgrind_without_big.inc

 --let MYSQLD_DATADIR= `select @@datadir`
 let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --tmpdir=$MYSQL_TMP_DIR --debug-dbug=+d,innodb_small_log_block_no_limit;
--- a/mysql-test/suite/mariabackup/defer_space.test
+++ b/mysql-test/suite/mariabackup/defer_space.test
@ -1,6 +1,7 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc

 call mtr.add_suppression("InnoDB: Expected tablespace id .*");
 --echo # Mariabackup --backup with page0 INIT_PAGE redo record
--- a/mysql-test/suite/mariabackup/innodb_redo_log_overwrite.test
+++ b/mysql-test/suite/mariabackup/innodb_redo_log_overwrite.test
@ -1,6 +1,7 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/have_sequence.inc
+--source include/no_valgrind_without_big.inc

 CREATE TABLE t(i INT) ENGINE=INNODB;

--- a/mysql-test/suite/mariabackup/innodb_redo_overwrite.test
+++ b/mysql-test/suite/mariabackup/innodb_redo_overwrite.test
@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_debug_sync.inc
+--source include/no_valgrind_without_big.inc

 CREATE TABLE t(i INT) ENGINE=INNODB;

--- a/storage/innobase/btr/btr0cur.cc
+++ b/storage/innobase/btr/btr0cur.cc
@ -2393,9 +2393,8 @@ need_opposite_intention:
 		page hash index, while holding search latch. */
 		if (!btr_search_enabled) {
 		} else if (tuple->info_bits & REC_INFO_MIN_REC_FLAG) {
-			ut_ad(index->is_instant());
 			/* This may be a search tuple for
-			btr_pcur_restore_position(). */
+			btr_pcur_t::restore_position(). */
 			ut_ad(tuple->is_metadata()
 			      || (tuple->is_metadata(tuple->info_bits
 						     ^ REC_STATUS_INSTANT)));