diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:17:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:17:51 +0300 |
| commit | 1df1a6392477ad211b2a66c6eccbe9d5c6316c7e (patch) | |
| tree | 7f38ad7d6e69ea53fb9c887ff9aaa953f103ea54 /mysql-test/suite/mariabackup | |
| parent | 6d3747a294d75ab8153f82c5b2d61c3bf17b04de (diff) | |
| parent | dba7e1e8e14254c9de61e74b7e68cdbbad0038a8 (diff) | |
| download | mariadb-git-1df1a6392477ad211b2a66c6eccbe9d5c6316c7e.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/mariabackup')
| -rw-r--r-- | mysql-test/suite/mariabackup/incremental_backup.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/mariabackup/incremental_backup.test b/mysql-test/suite/mariabackup/incremental_backup.test index 3e877af1398..88e277fd95a 100644 --- a/mysql-test/suite/mariabackup/incremental_backup.test +++ b/mysql-test/suite/mariabackup/incremental_backup.test @@ -1,6 +1,11 @@ --source include/have_aria.inc --source include/innodb_page_size.inc +# see suite.pm "check for exact values, in case the default changes to be small everywhere" +if (`select @@max_binlog_stmt_cache_size = 4294963200 and @@innodb_page_size = 65536`) { + skip skipped on 32bit; # tries to allocate 1GB of memory + } + call mtr.add_suppression("InnoDB: New log files created"); let basedir=$MYSQLTEST_VARDIR/tmp/backup; |