diff options
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 18 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 3 |
2 files changed, 2 insertions, 19 deletions
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index ba765aa1a27..3c2ee1bdf04 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -72,7 +72,6 @@ Created 10/8/1995 Heikki Tuuri #include "fil0fil.h" #include "fil0crypt.h" #include "fil0pagecompress.h" -#include "btr0scrub.h" #include <my_service_manager.h> @@ -403,6 +402,8 @@ my_bool srv_force_primary_key; /** Key version to encrypt the temporary tablespace */ my_bool innodb_encrypt_temporary_tables; +my_bool srv_immediate_scrub_data_uncompressed; + /* Array of English strings describing the current state of an i/o handler thread */ @@ -1113,11 +1114,9 @@ srv_export_innodb_status(void) /*==========================*/ { fil_crypt_stat_t crypt_stat; - btr_scrub_stat_t scrub_stat; if (!srv_read_only_mode) { fil_crypt_total_stat(&crypt_stat); - btr_scrub_total_stat(&scrub_stat); } #ifdef BTR_CUR_HASH_ADAPT @@ -1346,19 +1345,6 @@ srv_export_innodb_status(void) srv_stats.n_key_requests; export_vars.innodb_key_rotation_list_length = srv_stats.key_rotation_list_length; - - export_vars.innodb_scrub_page_reorganizations = - scrub_stat.page_reorganizations; - export_vars.innodb_scrub_page_splits = - scrub_stat.page_splits; - export_vars.innodb_scrub_page_split_failures_underflow = - scrub_stat.page_split_failures_underflow; - export_vars.innodb_scrub_page_split_failures_out_of_filespace = - scrub_stat.page_split_failures_out_of_filespace; - export_vars.innodb_scrub_page_split_failures_missing_index = - scrub_stat.page_split_failures_missing_index; - export_vars.innodb_scrub_page_split_failures_unknown = - scrub_stat.page_split_failures_unknown; } mutex_exit(&srv_innodb_monitor_mutex); diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 406308cb071..fbf66f70e4a 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -100,7 +100,6 @@ Created 2/16/1996 Heikki Tuuri #include "os0event.h" #include "zlib.h" #include "ut0crc32.h" -#include "btr0scrub.h" /** Log sequence number at shutdown */ lsn_t srv_shutdown_lsn; @@ -2028,7 +2027,6 @@ skip_monitors: will flush dirty pages and that might need e.g. fil_crypt_threads_event. */ fil_system_enter(); - btr_scrub_init(); fil_crypt_threads_init(); fil_system_exit(); @@ -2136,7 +2134,6 @@ void innodb_shutdown() fts_optimize_shutdown(); dict_stats_shutdown(); */ fil_crypt_threads_cleanup(); - btr_scrub_cleanup(); btr_defragment_shutdown(); } |