diff options
Diffstat (limited to 'storage/rocksdb/rdb_i_s.cc')
| -rw-r--r-- | storage/rocksdb/rdb_i_s.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/storage/rocksdb/rdb_i_s.cc b/storage/rocksdb/rdb_i_s.cc index 35b0cf4899e..158a7070ea9 100644 --- a/storage/rocksdb/rdb_i_s.cc +++ b/storage/rocksdb/rdb_i_s.cc @@ -256,7 +256,7 @@ static int rdb_i_s_perf_context_fill_table( Rdb_perf_counters counters; if (rdb_normalize_tablename(it, &str)) { - return HA_ERR_INTERNAL_ERROR; + DBUG_RETURN(HA_ERR_INTERNAL_ERROR); } if (rdb_split_normalized_tablename(str, &dbname, &tablename, &partname)) { @@ -447,8 +447,6 @@ static int rdb_i_s_cfoptions_fill_table( opts.disable_auto_compactions ? "ON" : "OFF"}, {"PURGE_REDUNDANT_KVS_WHILE_FLUSH", opts.purge_redundant_kvs_while_flush ? "ON" : "OFF"}, - {"VERIFY_CHECKSUM_IN_COMPACTION", - opts.verify_checksums_in_compaction ? "ON" : "OFF"}, {"MAX_SEQUENTIAL_SKIP_IN_ITERATIONS", std::to_string(opts.max_sequential_skip_in_iterations)}, {"MEMTABLE_FACTORY", opts.memtable_factory == nullptr @@ -463,8 +461,6 @@ static int rdb_i_s_cfoptions_fill_table( std::to_string(opts.memtable_huge_page_size)}, {"BLOOM_LOCALITY", std::to_string(opts.bloom_locality)}, {"MAX_SUCCESSIVE_MERGES", std::to_string(opts.max_successive_merges)}, - {"MIN_PARTIAL_MERGE_OPERANDS", - std::to_string(opts.min_partial_merge_operands)}, {"OPTIMIZE_FILTERS_FOR_HITS", (opts.optimize_filters_for_hits ? "ON" : "OFF")}, }; @@ -811,7 +807,7 @@ static int rdb_i_s_compact_stats_fill_table( DBUG_ASSERT(thd != nullptr); DBUG_ASSERT(tables != nullptr); - DBUG_ENTER("rdb_i_s_global_compact_stats_table"); + DBUG_ENTER_FUNC(); int ret = 0; @@ -1025,7 +1021,7 @@ static int rdb_i_s_global_info_init(void *const p) { static int rdb_i_s_compact_stats_init(void *p) { my_core::ST_SCHEMA_TABLE *schema; - DBUG_ENTER("rdb_i_s_compact_stats_init"); + DBUG_ENTER_FUNC(); DBUG_ASSERT(p != nullptr); schema = reinterpret_cast<my_core::ST_SCHEMA_TABLE *>(p); |