summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2017-01-11 17:32:47 +0300
committerSergei Petrunia <psergey@askmonty.org>2017-01-11 17:32:47 +0300
commit80be676fc0ee258e524510539a5a5cf44b951138 (patch)
tree5ae26db80e14e7e368d0378e69bdf87b8f67c10a
parentedfe980aa13a51a4209fc5e0280459dc14edcae6 (diff)
downloadmariadb-git-10.2-mariarocks.tar.gz
MariaRocks port10.2-mariarocks
- Use rocksdb_sys_vars/my.cnf so that one can run tests from that suite by just "./mtr rocksdb_sys_vars.$TESTNAME" - Add rocksdb and rocksdb_sys_vars to the set of default test suites. Don't run with embedded server, yet.
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/suite.pm8
-rw-r--r--storage/rocksdb/mysql-test/rocksdb_sys_vars/my.cnf12
-rw-r--r--storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm8
3 files changed, 28 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/suite.pm b/storage/rocksdb/mysql-test/rocksdb/suite.pm
new file mode 100644
index 00000000000..658a0b3b4d1
--- /dev/null
+++ b/storage/rocksdb/mysql-test/rocksdb/suite.pm
@@ -0,0 +1,8 @@
+package My::Suite::Rocksdb_sys_vars;
+
+@ISA = qw(My::Suite);
+
+sub is_default { not $::opt_embedded_server }
+
+bless { };
+
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/my.cnf b/storage/rocksdb/mysql-test/rocksdb_sys_vars/my.cnf
new file mode 100644
index 00000000000..d5f501e15ad
--- /dev/null
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/my.cnf
@@ -0,0 +1,12 @@
+!include include/default_my.cnf
+
+[server]
+rocksdb
+skip-innodb
+default-storage-engine=rocksdb
+
+
+sql-mode=NO_ENGINE_SUBSTITUTION
+explicit-defaults-for-timestamp=1
+rocksdb_lock_wait_timeout=1
+rocksdb_strict_collation_check=0
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm
new file mode 100644
index 00000000000..658a0b3b4d1
--- /dev/null
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm
@@ -0,0 +1,8 @@
+package My::Suite::Rocksdb_sys_vars;
+
+@ISA = qw(My::Suite);
+
+sub is_default { not $::opt_embedded_server }
+
+bless { };
+