MDEV-31308 InnoDB monitor trx_rseg_history_len was accidentally disabled by default

innodb_counter_info[]: Revert a change that was accidentally made in commit 204e722

Author: dr-m

mysql-test/suite/innodb/r/monitor.result

@@ -1,10 +1,9 @@
-set global innodb_monitor_disable = All;
 select name, if(enabled,'enabled','disabled') status
 from information_schema.innodb_metrics;
 name	status
 metadata_table_handles_opened	disabled
-lock_deadlocksdisabled
-lock_timeoutsdisabled
+lock_deadlocksenabled
+lock_timeoutsenabled
 lock_rec_lock_waits	disabled
 lock_table_lock_waits	disabled
 lock_rec_lock_requests	disabled
@@ -14,32 +13,32 @@ lock_rec_locks	disabled
 lock_table_lock_created	disabled
 lock_table_lock_removed	disabled
 lock_table_locks	disabled
-lock_row_lock_current_waitsdisabled
-lock_row_lock_timedisabled
-lock_row_lock_time_maxdisabled
-lock_row_lock_waitsdisabled
-lock_row_lock_time_avgdisabled
-buffer_pool_sizedisabled
-buffer_pool_readsdisabled
-buffer_pool_read_requestsdisabled
-buffer_pool_write_requestsdisabled
-buffer_pool_wait_freedisabled
-buffer_pool_read_aheaddisabled
-buffer_pool_read_ahead_evicteddisabled
-buffer_pool_pages_totaldisabled
-buffer_pool_pages_miscdisabled
-buffer_pool_pages_datadisabled
-buffer_pool_bytes_datadisabled
-buffer_pool_pages_dirtydisabled
-buffer_pool_bytes_dirtydisabled
-buffer_pool_pages_freedisabled
-buffer_pages_createddisabled
-buffer_pages_writtendisabled
-buffer_pages_readdisabled
-buffer_index_sec_rec_cluster_readsdisabled
-buffer_index_sec_rec_cluster_reads_avoideddisabled
-buffer_data_readsdisabled
-buffer_data_writtendisabled
+lock_row_lock_current_waitsenabled
+lock_row_lock_timeenabled
+lock_row_lock_time_maxenabled
+lock_row_lock_waitsenabled
+lock_row_lock_time_avgenabled
+buffer_pool_sizeenabled
+buffer_pool_readsenabled
+buffer_pool_read_requestsenabled
+buffer_pool_write_requestsenabled
+buffer_pool_wait_freeenabled
+buffer_pool_read_aheadenabled
+buffer_pool_read_ahead_evictedenabled
+buffer_pool_pages_totalenabled
+buffer_pool_pages_miscenabled
+buffer_pool_pages_dataenabled
+buffer_pool_bytes_dataenabled
+buffer_pool_pages_dirtyenabled
+buffer_pool_bytes_dirtyenabled
+buffer_pool_pages_freeenabled
+buffer_pages_createdenabled
+buffer_pages_writtenenabled
+buffer_pages_readenabled
+buffer_index_sec_rec_cluster_readsenabled
+buffer_index_sec_rec_cluster_reads_avoidedenabled
+buffer_data_readsenabled
+buffer_data_writtenenabled
 buffer_flush_batch_scanned	disabled
 buffer_flush_batch_num_scan	disabled
 buffer_flush_batch_scanned_per_call	disabled
@@ -72,8 +71,8 @@ buffer_flush_background_pages	disabled
 buffer_LRU_batch_scanned	disabled
 buffer_LRU_batch_num_scan	disabled
 buffer_LRU_batch_scanned_per_call	disabled
-buffer_LRU_batch_flush_total_pagesdisabled
-buffer_LRU_batch_evict_total_pagesdisabled
+buffer_LRU_batch_flush_total_pagesenabled
+buffer_LRU_batch_evict_total_pagesenabled
 buffer_LRU_single_flush_failure_count	disabled
 buffer_LRU_get_free_search	disabled
 buffer_LRU_search_scanned	disabled
@@ -114,24 +113,24 @@ buffer_page_written_blob	disabled
 buffer_page_written_zblob	disabled
 buffer_page_written_zblob2	disabled
 buffer_page_written_other	disabled
-os_data_readsdisabled
-os_data_writesdisabled
-os_data_fsyncsdisabled
-os_pending_readsdisabled
-os_pending_writesdisabled
-os_log_bytes_writtendisabled
-os_log_fsyncsdisabled
-os_log_pending_fsyncsdisabled
-os_log_pending_writesdisabled
+os_data_readsenabled
+os_data_writesenabled
+os_data_fsyncsenabled
+os_pending_readsenabled
+os_pending_writesenabled
+os_log_bytes_writtenenabled
+os_log_fsyncsenabled
+os_log_pending_fsyncsenabled
+os_log_pending_writesenabled
 trx_rw_commits	disabled
 trx_ro_commits	disabled
 trx_nl_ro_commits	disabled
 trx_commits_insert_update	disabled
 trx_rollbacks	disabled
 trx_rollbacks_savepoint	disabled
-trx_rseg_history_lendisabled
+trx_rseg_history_lenenabled
 trx_undo_slots_used	disabled
-trx_undo_slots_cacheddisabled
+trx_undo_slots_cachedenabled
 trx_rseg_current_size	disabled
 purge_del_mark_records	disabled
 purge_upd_exist_or_extern_records	disabled
@@ -150,10 +149,10 @@ log_max_modified_age_async	disabled
 log_pending_log_flushes	disabled
 log_pending_checkpoint_writes	disabled
 log_num_log_io	disabled
-log_waitsdisabled
-log_write_requestsdisabled
-log_writesdisabled
-log_paddeddisabled
+log_waitsenabled
+log_write_requestsenabled
+log_writesenabled
+log_paddedenabled
 compress_pages_compressed	disabled
 compress_pages_decompressed	disabled
 compression_pad_increments	disabled
@@ -171,42 +170,42 @@ index_page_merge_successful	disabled
 index_page_reorg_attempts	disabled
 index_page_reorg_successful	disabled
 index_page_discards	disabled
-adaptive_hash_searchesdisabled
-adaptive_hash_searches_btreedisabled
+adaptive_hash_searchesenabled
+adaptive_hash_searches_btreeenabled
 adaptive_hash_pages_added	disabled
 adaptive_hash_pages_removed	disabled
 adaptive_hash_rows_added	disabled
 adaptive_hash_rows_removed	disabled
 adaptive_hash_rows_deleted_no_hash_entry	disabled
 adaptive_hash_rows_updated	disabled
-file_num_open_filesdisabled
-ibuf_merges_insertdisabled
-ibuf_merges_delete_markdisabled
-ibuf_merges_deletedisabled
-ibuf_merges_discard_insertdisabled
-ibuf_merges_discard_delete_markdisabled
-ibuf_merges_discard_deletedisabled
-ibuf_mergesdisabled
-ibuf_sizedisabled
+file_num_open_filesenabled
+ibuf_merges_insertenabled
+ibuf_merges_delete_markenabled
+ibuf_merges_deleteenabled
+ibuf_merges_discard_insertenabled
+ibuf_merges_discard_delete_markenabled
+ibuf_merges_discard_deleteenabled
+ibuf_mergesenabled
+ibuf_sizeenabled
 innodb_master_thread_sleeps	disabled
-innodb_activity_countdisabled
+innodb_activity_countenabled
 innodb_master_active_loops	disabled
 innodb_master_idle_loops	disabled
 innodb_log_flush_usec	disabled
 innodb_dict_lru_usec	disabled
 innodb_dict_lru_count_active	disabled
 innodb_dict_lru_count_idle	disabled
-innodb_dblwr_writesdisabled
-innodb_dblwr_pages_writtendisabled
-innodb_page_sizedisabled
+innodb_dblwr_writesenabled
+innodb_dblwr_pages_writtenenabled
+innodb_page_sizeenabled
 dml_reads	disabled
-dml_insertsdisabled
-dml_deletesdisabled
-dml_updatesdisabled
-dml_system_readsdisabled
-dml_system_insertsdisabled
-dml_system_deletesdisabled
-dml_system_updatesdisabled
+dml_insertsenabled
+dml_deletesenabled
+dml_updatesenabled
+dml_system_readsenabled
+dml_system_insertsenabled
+dml_system_deletesenabled
+dml_system_updatesenabled
 ddl_background_drop_indexes	disabled
 ddl_online_create_index	disabled
 ddl_pending_alter_table	disabled
@@ -216,6 +215,9 @@ icp_attempts	disabled
 icp_no_match	disabled
 icp_out_of_range	disabled
 icp_match	disabled
+set global innodb_monitor_disable = All;
+select name from information_schema.innodb_metrics where enabled;
+name
 set global innodb_monitor_enable = all;
 select name from information_schema.innodb_metrics where not enabled;
 name

mysql-test/suite/innodb/t/monitor.test

@@ -5,12 +5,14 @@
 # sys_vars.innodb_monitor_enable_basic
 
 --source include/have_innodb.inc
-set global innodb_monitor_disable = All;
 # Test turn on/off the monitor counter with "all" option
 # By default, they will be off.
 select name, if(enabled,'enabled','disabled') status
 from information_schema.innodb_metrics;
 
+set global innodb_monitor_disable = All;
+select name from information_schema.innodb_metrics where enabled;
+
 # Turn on all monitor counters
 set global innodb_monitor_enable = all;
 

storage/innobase/srv/srv0mon.cc

@@ -704,7 +704,7 @@ static monitor_info_t	innodb_counter_info[] =
 {"trx_rseg_history_len", "transaction",
  "Length of the TRX_RSEG_HISTORY list",
  static_cast<monitor_type_t>(
- MONITOR_EXISTING | MONITOR_DISPLAY_CURRENT),
+ MONITOR_EXISTING | MONITOR_DISPLAY_CURRENT | MONITOR_DEFAULT_ON),
  MONITOR_DEFAULT_START, MONITOR_RSEG_HISTORY_LEN},
 
 {"trx_undo_slots_used", "transaction", "Number of undo slots used",