diff options
Diffstat (limited to 'storage/rocksdb/rdb_i_s.cc')
| -rw-r--r-- | storage/rocksdb/rdb_i_s.cc | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/storage/rocksdb/rdb_i_s.cc b/storage/rocksdb/rdb_i_s.cc index 5350ec3bce9..a3d284dfa64 100644 --- a/storage/rocksdb/rdb_i_s.cc +++ b/storage/rocksdb/rdb_i_s.cc @@ -145,9 +145,6 @@ static int rdb_i_s_cfstats_fill_table( static int rdb_i_s_cfstats_init(void *p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -241,9 +238,6 @@ static int rdb_i_s_dbstats_fill_table( static int rdb_i_s_dbstats_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -344,8 +338,6 @@ static int rdb_i_s_perf_context_fill_table( static int rdb_i_s_perf_context_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -413,9 +405,6 @@ static int rdb_i_s_perf_context_global_fill_table( static int rdb_i_s_perf_context_global_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -1045,9 +1034,6 @@ static int rdb_i_s_ddl_fill_table(my_core::THD *const thd, static int rdb_i_s_ddl_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - my_core::ST_SCHEMA_TABLE *schema; DBUG_ASSERT(p != nullptr); @@ -1063,9 +1049,6 @@ static int rdb_i_s_ddl_init(void *const p) { static int rdb_i_s_cfoptions_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -1081,9 +1064,6 @@ static int rdb_i_s_cfoptions_init(void *const p) { static int rdb_i_s_global_info_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -1101,9 +1081,6 @@ static int rdb_i_s_compact_stats_init(void *p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); schema = reinterpret_cast<my_core::ST_SCHEMA_TABLE *>(p); @@ -1438,9 +1415,6 @@ static int rdb_i_s_index_file_map_fill_table( static int rdb_i_s_index_file_map_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -1523,9 +1497,6 @@ static int rdb_i_s_lock_info_fill_table( static int rdb_i_s_lock_info_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -1651,9 +1622,6 @@ static int rdb_i_s_trx_info_fill_table( static int rdb_i_s_trx_info_init(void *const p) { DBUG_ENTER_FUNC(); - if (prevent_myrocks_loading) - DBUG_RETURN(1); - DBUG_ASSERT(p != nullptr); my_core::ST_SCHEMA_TABLE *schema; @@ -1781,7 +1749,8 @@ static int rdb_i_s_deadlock_info_init(void *const p) { static int rdb_i_s_deinit(void *p MY_ATTRIBUTE((__unused__))) { DBUG_ENTER_FUNC(); - DBUG_RETURN(0); + /* see the comment at the end of rocksdb_done_func() */ + DBUG_RETURN(1); } static struct st_mysql_information_schema rdb_i_s_info = { @@ -1955,7 +1924,7 @@ struct st_maria_plugin rdb_i_s_lock_info = { "RocksDB lock information", PLUGIN_LICENSE_GPL, rdb_i_s_lock_info_init, - nullptr, + rdb_i_s_deinit, 0x0001, /* version number (0.1) */ nullptr, /* status variables */ nullptr, /* system variables */ @@ -1971,7 +1940,7 @@ struct st_maria_plugin rdb_i_s_trx_info = { "RocksDB transaction information", PLUGIN_LICENSE_GPL, rdb_i_s_trx_info_init, - nullptr, + rdb_i_s_deinit, 0x0001, /* version number (0.1) */ nullptr, /* status variables */ nullptr, /* system variables */ @@ -1987,7 +1956,7 @@ struct st_maria_plugin rdb_i_s_deadlock_info = { "RocksDB transaction information", PLUGIN_LICENSE_GPL, rdb_i_s_deadlock_info_init, - nullptr, + rdb_i_s_deinit, 0x0001, /* version number (0.1) */ nullptr, /* status variables */ nullptr, /* system variables */ |