summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-11 10:16:38 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-11 10:16:52 +0200
commit4c1479545d10ba9047b01be1c663ad4d1fad39a1 (patch)
tree76f55015566d7057f64bd33d74d5d4b32be337c3 /mysql-test/suite/innodb
parentc903ba2f1ef5564d0eafd2803342f11cecb9bf01 (diff)
parentbdcd7f79e4a33e08bae31a86cee98e23ff6824ff (diff)
downloadmariadb-git-4c1479545d10ba9047b01be1c663ad4d1fad39a1.tar.gz
Merge 5.5 into 10.0
Diffstat (limited to 'mysql-test/suite/innodb')
-rw-r--r--mysql-test/suite/innodb/t/innodb-master.opt2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-master.opt b/mysql-test/suite/innodb/t/innodb-master.opt
index 5266978e4f0..2e71d62206d 100644
--- a/mysql-test/suite/innodb/t/innodb-master.opt
+++ b/mysql-test/suite/innodb/t/innodb-master.opt
@@ -2,3 +2,5 @@
--default-storage-engine=MyISAM
--innodb-strict-mode=0
--innodb-file-per-table=0
+--loose-innodb-track-changed-pages
+--loose-innodb-log-archive