From 8d8858c10aae562868218509aea4a01b1777e8cd Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Mon, 24 Oct 2016 10:38:18 +0000 Subject: [PATCH] MariaRocks: trying to get the MTR tests to work - Add include/have_rocksdb.inc (TODO: is there any way to have this file somewhere under storage/rocksdb/mysql-test ?) - Make rocksdb.test require have_partition.inc because it uses partitioned tables --- mysql-test/include/have_rocksdb.inc | 17 +++++++++++++++++ .../rocksdb/mysql-test/rocksdb/t/rocksdb.test | 1 + 2 files changed, 18 insertions(+) create mode 100644 mysql-test/include/have_rocksdb.inc diff --git a/mysql-test/include/have_rocksdb.inc b/mysql-test/include/have_rocksdb.inc new file mode 100644 index 00000000000..c76d851e339 --- /dev/null +++ b/mysql-test/include/have_rocksdb.inc @@ -0,0 +1,17 @@ +if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'rocksdb' AND support IN ('DEFAULT')`) +{ + --skip Test requires default engine RocksDB +} + +# MARIAROCKS_NOT_YET: replication doesn't work yet: +#if (`select count(*) = 0 from information_schema.tables where engine='rocksdb' and table_name='slave_gtid_info'`) +#{ +# --skip Test requires default engine RocksDB +#} + +--disable_query_log +# Table statistics can vary depending on when the memtables are flushed, so +# flush them at the beginning of the test to ensure the test runs consistently. +set global rocksdb_force_flush_memtable_now = true; +--enable_query_log + diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test index f612cb0997b..9808d50a092 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test @@ -1,4 +1,5 @@ --source include/have_rocksdb.inc +--source include/have_partition.inc # # RocksDB Storage Engine tests