From 2f1f02817e200892f4799784368bacea0a41ef0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 29 Apr 2019 09:27:32 +0300 Subject: [PATCH] After-merge fix for rocksdb Adjust a test for the merge commit e6bdf77e4be48750c4808a09af197ed91fd69a61 --- storage/rocksdb/mysql-test/rocksdb/r/cardinality.result | 1 + storage/rocksdb/mysql-test/rocksdb/t/cardinality.test | 2 ++ 2 files changed, 3 insertions(+) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/cardinality.result b/storage/rocksdb/mysql-test/rocksdb/r/cardinality.result index 5416bc995da..dcaca8b72bc 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/cardinality.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/cardinality.result @@ -1,4 +1,5 @@ # restart +set use_stat_tables= 'COMPLEMENTARY'; CREATE TABLE t0 (id int PRIMARY KEY, a int, INDEX ix_a (a)) engine=rocksdb; insert into t0 values (0, 0),(1, 1),(2, 2),(3, 3),(4, 4), (5, 4),(6, 4),(7, 4),(8, 4),(9, 4); diff --git a/storage/rocksdb/mysql-test/rocksdb/t/cardinality.test b/storage/rocksdb/mysql-test/rocksdb/t/cardinality.test index 21e4b49e560..1dcb176e4fa 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/cardinality.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/cardinality.test @@ -2,6 +2,8 @@ --source include/restart_mysqld.inc +set use_stat_tables= 'COMPLEMENTARY'; + # Test memtable cardinality statistics CREATE TABLE t0 (id int PRIMARY KEY, a int, INDEX ix_a (a)) engine=rocksdb;