1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-5236 Status variables are not all listed alphabetically

Browse Source 
sort xtradb status variables
This commit is contained in:
Sergei Golubchik 2013-11-19 13:11:42 +01:00
parent e730c91688
commit efab095c7f
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
storage/xtradb/handler/ha_innodb.cc
View File

@ -700,32 +700,32 @@ innobase_commit_low(
static SHOW_VAR innodb_status_variables[]= { static SHOW_VAR innodb_status_variables[]= {
{"adaptive_hash_cells", {"adaptive_hash_cells",
(char*) &export_vars.innodb_adaptive_hash_cells, SHOW_LONG}, (char*) &export_vars.innodb_adaptive_hash_cells, SHOW_LONG},
{"adaptive_hash_heap_buffers",
(char*) &export_vars.innodb_adaptive_hash_heap_buffers, SHOW_LONG},
{"adaptive_hash_hash_searches", {"adaptive_hash_hash_searches",
(char*) &export_vars.innodb_adaptive_hash_hash_searches, SHOW_LONG}, (char*) &export_vars.innodb_adaptive_hash_hash_searches, SHOW_LONG},
{"adaptive_hash_heap_buffers",
(char*) &export_vars.innodb_adaptive_hash_heap_buffers, SHOW_LONG},
{"adaptive_hash_non_hash_searches", {"adaptive_hash_non_hash_searches",
(char*) &export_vars.innodb_adaptive_hash_non_hash_searches, SHOW_LONG}, (char*) &export_vars.innodb_adaptive_hash_non_hash_searches, SHOW_LONG},
{"background_log_sync", {"background_log_sync",
(char*) &export_vars.innodb_background_log_sync, SHOW_LONG}, (char*) &export_vars.innodb_background_log_sync, SHOW_LONG},
{"buffer_pool_pages_data",
(char*) &export_vars.innodb_buffer_pool_pages_data, SHOW_LONG},
{"buffer_pool_bytes_data", {"buffer_pool_bytes_data",
(char*) &export_vars.innodb_buffer_pool_bytes_data, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_bytes_data, SHOW_LONG},
{"buffer_pool_pages_dirty",
(char*) &export_vars.innodb_buffer_pool_pages_dirty, SHOW_LONG},
{"buffer_pool_bytes_dirty", {"buffer_pool_bytes_dirty",
(char*) &export_vars.innodb_buffer_pool_bytes_dirty, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_bytes_dirty, SHOW_LONG},
{"buffer_pool_pages_data",
(char*) &export_vars.innodb_buffer_pool_pages_data, SHOW_LONG},
{"buffer_pool_pages_dirty",
(char*) &export_vars.innodb_buffer_pool_pages_dirty, SHOW_LONG},
{"buffer_pool_pages_flushed", {"buffer_pool_pages_flushed",
(char*) &export_vars.innodb_buffer_pool_pages_flushed, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_pages_flushed, SHOW_LONG},
{"buffer_pool_pages_LRU_flushed",
(char*) &export_vars.innodb_buffer_pool_pages_LRU_flushed, SHOW_LONG},
{"buffer_pool_pages_free", {"buffer_pool_pages_free",
(char*) &export_vars.innodb_buffer_pool_pages_free, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_pages_free, SHOW_LONG},
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
{"buffer_pool_pages_latched", {"buffer_pool_pages_latched",
(char*) &export_vars.innodb_buffer_pool_pages_latched, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_pages_latched, SHOW_LONG},
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
{"buffer_pool_pages_LRU_flushed",
(char*) &export_vars.innodb_buffer_pool_pages_LRU_flushed, SHOW_LONG},
{"buffer_pool_pages_made_not_young", {"buffer_pool_pages_made_not_young",
(char*) &export_vars.innodb_buffer_pool_pages_made_not_young, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_pages_made_not_young, SHOW_LONG},
{"buffer_pool_pages_made_young", {"buffer_pool_pages_made_young",
@ -736,12 +736,12 @@ static SHOW_VAR innodb_status_variables[]= {
(char*) &export_vars.innodb_buffer_pool_pages_old, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_pages_old, SHOW_LONG},
{"buffer_pool_pages_total", {"buffer_pool_pages_total",
(char*) &export_vars.innodb_buffer_pool_pages_total, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_pages_total, SHOW_LONG},
{"buffer_pool_read_ahead_rnd",
(char*) &export_vars.innodb_buffer_pool_read_ahead_rnd, SHOW_LONG},
{"buffer_pool_read_ahead", {"buffer_pool_read_ahead",
(char*) &export_vars.innodb_buffer_pool_read_ahead, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_read_ahead, SHOW_LONG},
{"buffer_pool_read_ahead_evicted", {"buffer_pool_read_ahead_evicted",
(char*) &export_vars.innodb_buffer_pool_read_ahead_evicted, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_read_ahead_evicted, SHOW_LONG},
{"buffer_pool_read_ahead_rnd",
(char*) &export_vars.innodb_buffer_pool_read_ahead_rnd, SHOW_LONG},
{"buffer_pool_read_requests", {"buffer_pool_read_requests",
(char*) &export_vars.innodb_buffer_pool_read_requests, SHOW_LONG}, (char*) &export_vars.innodb_buffer_pool_read_requests, SHOW_LONG},
{"buffer_pool_reads", {"buffer_pool_reads",
@ -756,6 +756,8 @@ static SHOW_VAR innodb_status_variables[]= {
(char*) &export_vars.innodb_checkpoint_max_age, SHOW_LONG}, (char*) &export_vars.innodb_checkpoint_max_age, SHOW_LONG},
{"checkpoint_target_age", {"checkpoint_target_age",
(char*) &export_vars.innodb_checkpoint_target_age, SHOW_LONG}, (char*) &export_vars.innodb_checkpoint_target_age, SHOW_LONG},
{"current_row_locks",
(char*) &export_vars.innodb_current_row_locks, SHOW_LONG},
{"data_fsyncs", {"data_fsyncs",
(char*) &export_vars.innodb_data_fsyncs, SHOW_LONG}, (char*) &export_vars.innodb_data_fsyncs, SHOW_LONG},
{"data_pending_fsyncs", {"data_pending_fsyncs",
@ -778,6 +780,8 @@ static SHOW_VAR innodb_status_variables[]= {
(char*) &export_vars.innodb_dblwr_writes, SHOW_LONG}, (char*) &export_vars.innodb_dblwr_writes, SHOW_LONG},
{"deadlocks", {"deadlocks",
(char*) &export_vars.innodb_deadlocks, SHOW_LONG}, (char*) &export_vars.innodb_deadlocks, SHOW_LONG},
{"descriptors_memory",
(char*) &export_vars.innodb_descriptors_memory, SHOW_LONG},
{"dict_tables", {"dict_tables",
(char*) &export_vars.innodb_dict_tables, SHOW_LONG}, (char*) &export_vars.innodb_dict_tables, SHOW_LONG},
{"have_atomic_builtins", {"have_atomic_builtins",
@ -860,12 +864,20 @@ static SHOW_VAR innodb_status_variables[]= {
(char*) &export_vars.innodb_pages_written, SHOW_LONG}, (char*) &export_vars.innodb_pages_written, SHOW_LONG},
{"purge_trx_id", {"purge_trx_id",
(char*) &export_vars.innodb_purge_trx_id, SHOW_LONGLONG}, (char*) &export_vars.innodb_purge_trx_id, SHOW_LONGLONG},
#ifdef UNIV_DEBUG
{"purge_trx_id_age",
(char*) &export_vars.innodb_purge_trx_id_age, SHOW_LONG},
#endif /* UNIV_DEBUG */
{"purge_undo_no", {"purge_undo_no",
(char*) &export_vars.innodb_purge_undo_no, SHOW_LONGLONG}, (char*) &export_vars.innodb_purge_undo_no, SHOW_LONGLONG},
#ifdef UNIV_DEBUG
{"purge_view_trx_id_age",
(char*) &export_vars.innodb_purge_view_trx_id_age, SHOW_LONG},
#endif /* UNIV_DEBUG */
{"read_views_memory",
(char*) &export_vars.innodb_read_views_memory, SHOW_LONG},
{"row_lock_current_waits", {"row_lock_current_waits",
(char*) &export_vars.innodb_row_lock_current_waits, SHOW_LONG}, (char*) &export_vars.innodb_row_lock_current_waits, SHOW_LONG},
{"current_row_locks",
(char*) &export_vars.innodb_current_row_locks, SHOW_LONG},
{"row_lock_time", {"row_lock_time",
(char*) &export_vars.innodb_row_lock_time, SHOW_LONGLONG}, (char*) &export_vars.innodb_row_lock_time, SHOW_LONGLONG},
{"row_lock_time_avg", {"row_lock_time_avg",
@ -882,10 +894,6 @@ static SHOW_VAR innodb_status_variables[]= {
(char*) &export_vars.innodb_rows_read, SHOW_LONG}, (char*) &export_vars.innodb_rows_read, SHOW_LONG},
{"rows_updated", {"rows_updated",
(char*) &export_vars.innodb_rows_updated, SHOW_LONG}, (char*) &export_vars.innodb_rows_updated, SHOW_LONG},
{"read_views_memory",
(char*) &export_vars.innodb_read_views_memory, SHOW_LONG},
{"descriptors_memory",
(char*) &export_vars.innodb_descriptors_memory, SHOW_LONG},
{"s_lock_os_waits", {"s_lock_os_waits",
(char*) &export_vars.innodb_s_lock_os_waits, SHOW_LONGLONG}, (char*) &export_vars.innodb_s_lock_os_waits, SHOW_LONGLONG},
{"s_lock_spin_rounds", {"s_lock_spin_rounds",
@ -900,12 +908,6 @@ static SHOW_VAR innodb_status_variables[]= {
(char*) &export_vars.innodb_x_lock_spin_rounds, SHOW_LONGLONG}, (char*) &export_vars.innodb_x_lock_spin_rounds, SHOW_LONGLONG},
{"x_lock_spin_waits", {"x_lock_spin_waits",
(char*) &export_vars.innodb_x_lock_spin_waits, SHOW_LONGLONG}, (char*) &export_vars.innodb_x_lock_spin_waits, SHOW_LONGLONG},
#ifdef UNIV_DEBUG
{"purge_trx_id_age",
(char*) &export_vars.innodb_purge_trx_id_age, SHOW_LONG},
{"purge_view_trx_id_age",
(char*) &export_vars.innodb_purge_view_trx_id_age, SHOW_LONG},
#endif /* UNIV_DEBUG */
{NullS, NullS, SHOW_LONG} {NullS, NullS, SHOW_LONG}
}; };