Post-merge fixes after pull request #14

facebook · Jan 24, 2017 · 740466e · 740466e
1 parent 219953b
commit 740466e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/mysql-test/r/rocksdb.result b/mysql-test/r/rocksdb.result
@@ -822,12 +822,11 @@ Variable_name	Value
 rocksdb_block_cache_size	8388608
 rocksdb_bulk_load	OFF
 rocksdb_bulk_load_size	1000
+rocksdb_cf_options_file	
 rocksdb_db_options	
 rocksdb_default_cf_options	
 rocksdb_lock_wait_timeout	1
 rocksdb_max_row_locks	1073741824
-rocksdb_target_file_size_base	2097152
-rocksdb_write_buffer_size	4194304
 create table t47 (pk int primary key, col1 varchar(12)) engine=rocksdb;
 insert into t47 values (1, 'row1');
 insert into t47 values (2, 'row2');

diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
@@ -35,7 +35,7 @@
 #include "rdb_cf_manager.h"
 
 #include "rocksdb/table.h"
-#include "utilities/convenience.h"
+#include "rocksdb/utilities/convenience.h"
 
 /* This is here to get PRIu64, PRId64 */
 #ifndef __STDC_FORMAT_MACROS