diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-10 09:49:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-10 09:49:18 +0200 |
| commit | 038cd5195612084542704f181695358e3b8959a8 (patch) | |
| tree | baf64530b9ca66b4b9d356403b550aa58d6588d9 /mysql-test/suite/mariabackup | |
| parent | fe9412dbc9ce4cb1764a3669ee89dcf687d68fb5 (diff) | |
| parent | 08e2c98ec81d6fb23b0a8079107d4c74d3a8ec02 (diff) | |
| download | mariadb-git-038cd5195612084542704f181695358e3b8959a8.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/suite/mariabackup')
4 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/mariabackup/big_innodb_log.test b/mysql-test/suite/mariabackup/big_innodb_log.test index 23ac59c13eb..85d22a8227b 100644 --- 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; diff --git a/mysql-test/suite/mariabackup/defer_space.test b/mysql-test/suite/mariabackup/defer_space.test index 65f2262fd1d..a475b010531 100644 --- 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 diff --git a/mysql-test/suite/mariabackup/innodb_redo_log_overwrite.test b/mysql-test/suite/mariabackup/innodb_redo_log_overwrite.test index 22165ff29be..8bbd4e761a6 100644 --- 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; diff --git a/mysql-test/suite/mariabackup/innodb_redo_overwrite.test b/mysql-test/suite/mariabackup/innodb_redo_overwrite.test index 34198222cea..ab5993d232c 100644 --- a/mysql-test/suite/mariabackup/innodb_redo_overwrite.test +++ b/mysql-test/suite/mariabackup/innodb_redo_overwrite.test @@ -2,6 +2,7 @@ --source include/have_debug_sync.inc --source include/have_debug.inc --source include/have_sequence.inc +--source include/no_valgrind_without_big.inc CREATE TABLE t ENGINE=INNODB SELECT seq%10 i FROM seq_0_to_204796; |