diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-27 00:02:02 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2022-12-27 00:02:02 +0300 |
| commit | 72e2d1d2201c2da23777d8fb89e078475e0c1371 (patch) | |
| tree | ac111b963a07bc17ff7ef771d6f3c00428a3a83a /mysql-test | |
| parent | e056efdd6cfa62cc4c978fce5730af0b8d4c3c6b (diff) | |
| download | mariadb-git-72e2d1d2201c2da23777d8fb89e078475e0c1371.tar.gz | |
MDEV-25004 Refactorings
* Avoid some pessimization
* Slightly smaller upgrade dataset
* Simplify vers_row_same_trx() and its caller
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/std_data/versioning/ibdata1.gz | bin | 51165 -> 41597 bytes | |||
| -rw-r--r-- | mysql-test/suite/innodb_fts/t/versioning.test | 7 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/std_data/versioning/ibdata1.gz b/mysql-test/std_data/versioning/ibdata1.gz Binary files differindex bddd2307181..345217ba593 100644 --- a/mysql-test/std_data/versioning/ibdata1.gz +++ b/mysql-test/std_data/versioning/ibdata1.gz diff --git a/mysql-test/suite/innodb_fts/t/versioning.test b/mysql-test/suite/innodb_fts/t/versioning.test index b492f9c9d98..286597fba39 100644 --- a/mysql-test/suite/innodb_fts/t/versioning.test +++ b/mysql-test/suite/innodb_fts/t/versioning.test @@ -12,7 +12,7 @@ # Examples # # export OLD_BINDIR="/home/midenok/src/mariadb/10.3b/build" -# mtr innodb_fts.versioning,orig_stopword,prepare +# ./mtr innodb_fts.versioning,prepare # if ($MTR_COMBINATION_PREPARE) @@ -56,11 +56,16 @@ if ($MTR_COMBINATION_PREPARE) --exec mkdir -p $std_dir --exec cp -af $datadir/ibdata1 $datadir/test/*.frm $std_dir + # zero out the doublewrite buffer + --exec dd if=/dev/zero of=$std_dir/ibdata1 bs=16k seek=64 count=128 conv=notrunc --exec gzip -9f $std_dir/ibdata1 $std_dir/*.frm } if ($MTR_COMBINATION_UPGRADE) { +--disable_query_log +call mtr.add_suppression("InnoDB: Table `mysql`.\`innodb_(table|index)_stats`"); +--enable_query_log --source include/shutdown_mysqld.inc --exec rm -f $datadir/test/*.ibd $datadir/ib* --exec cp -af $std_dir/ibdata1.gz $datadir |