summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2017-06-02 01:46:25 +0300
committerElena Stepanova <elenst@montyprogram.com>2017-06-02 01:46:25 +0300
commitab62b7538f2eab43943da56c3a6d74cd85dfa877 (patch)
treebdedd5de7af2c7f3475251eec926f898c82677db /mysql-test/include
parentc2ef0bb6cecf034b32fced19d132432b90f3c4d5 (diff)
downloadmariadb-git-ab62b7538f2eab43943da56c3a6d74cd85dfa877.tar.gz
MDEV-12042 Re-bootstrap the server if InnoDB options are incompatiblebb-10.0-elenst-mdev12042
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/innodb_page_size.combinations8
-rw-r--r--mysql-test/include/innodb_page_size.inc4
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/include/innodb_page_size.combinations b/mysql-test/include/innodb_page_size.combinations
new file mode 100644
index 00000000000..a9b7c7ce14d
--- /dev/null
+++ b/mysql-test/include/innodb_page_size.combinations
@@ -0,0 +1,8 @@
+[16k]
+innodb-page-size=16K
+
+[8k]
+innodb-page-size=8K
+
+[4k]
+innodb-page-size=4K
diff --git a/mysql-test/include/innodb_page_size.inc b/mysql-test/include/innodb_page_size.inc
new file mode 100644
index 00000000000..754b640da86
--- /dev/null
+++ b/mysql-test/include/innodb_page_size.inc
@@ -0,0 +1,4 @@
+# The goal of including this file is to enable innodb_page_size combinations
+# (see include/innodb_page_size.combinations)
+
+--source include/have_innodb.inc