summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2014-12-05 14:23:24 +0400
committerElena Stepanova <elenst@montyprogram.com>2014-12-05 14:23:24 +0400
commit010724f6c5d6ff687aade00b4d267958a669c5a7 (patch)
treed075a3b2f57a4229c9fee1166b61eef2635b8880
parentc8f7f98737ca22b9f20cf835896f99e3ecc77495 (diff)
downloadmariadb-git-010724f6c5d6ff687aade00b4d267958a669c5a7.tar.gz
Run engines tests for MyISAM and in-built InnoDB
-rw-r--r--mysql-test/suite/engines/funcs/combinations11
-rw-r--r--mysql-test/suite/engines/iuds/combinations8
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/suite/engines/funcs/combinations b/mysql-test/suite/engines/funcs/combinations
new file mode 100644
index 00000000000..4d236d27b8f
--- /dev/null
+++ b/mysql-test/suite/engines/funcs/combinations
@@ -0,0 +1,11 @@
+[innodb]
+innodb
+default-storage-engine=innodb
+partition
+
+[myisam]
+skip-innodb
+default-storage-engine=myisam
+partition
+
+
diff --git a/mysql-test/suite/engines/iuds/combinations b/mysql-test/suite/engines/iuds/combinations
new file mode 100644
index 00000000000..2077c41a7be
--- /dev/null
+++ b/mysql-test/suite/engines/iuds/combinations
@@ -0,0 +1,8 @@
+[innodb]
+innodb
+default-storage-engine=innodb
+
+[myisam]
+skip-innodb
+default-storage-engine=myisam
+