Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
848853ea
Commit
848853ea
authored
Aug 27, 2005
by
paul@frost.snake.net
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysqld.cc:
Reorder out-of-order status variables.
parent
0f6a1f65
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
26 deletions
+26
-26
sql/mysqld.cc
sql/mysqld.cc
+26
-26
No files found.
sql/mysqld.cc
View file @
848853ea
...
@@ -4483,6 +4483,7 @@ struct show_var_st status_vars[]= {
...
@@ -4483,6 +4483,7 @@ struct show_var_st status_vars[]= {
{
"Com_show_databases"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_DATABASES
),
SHOW_LONG
},
{
"Com_show_databases"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_DATABASES
),
SHOW_LONG
},
{
"Com_show_fields"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_FIELDS
),
SHOW_LONG
},
{
"Com_show_fields"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_FIELDS
),
SHOW_LONG
},
{
"Com_show_grants"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_GRANTS
),
SHOW_LONG
},
{
"Com_show_grants"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_GRANTS
),
SHOW_LONG
},
{
"Com_show_innodb_status"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_INNODB_STATUS
),
SHOW_LONG
},
{
"Com_show_keys"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_KEYS
),
SHOW_LONG
},
{
"Com_show_keys"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_KEYS
),
SHOW_LONG
},
{
"Com_show_logs"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_LOGS
),
SHOW_LONG
},
{
"Com_show_logs"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_LOGS
),
SHOW_LONG
},
{
"Com_show_master_status"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_MASTER_STAT
),
SHOW_LONG
},
{
"Com_show_master_status"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_MASTER_STAT
),
SHOW_LONG
},
...
@@ -4492,7 +4493,6 @@ struct show_var_st status_vars[]= {
...
@@ -4492,7 +4493,6 @@ struct show_var_st status_vars[]= {
{
"Com_show_slave_hosts"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_SLAVE_HOSTS
),
SHOW_LONG
},
{
"Com_show_slave_hosts"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_SLAVE_HOSTS
),
SHOW_LONG
},
{
"Com_show_slave_status"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_SLAVE_STAT
),
SHOW_LONG
},
{
"Com_show_slave_status"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_SLAVE_STAT
),
SHOW_LONG
},
{
"Com_show_status"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_STATUS
),
SHOW_LONG
},
{
"Com_show_status"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_STATUS
),
SHOW_LONG
},
{
"Com_show_innodb_status"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_INNODB_STATUS
),
SHOW_LONG
},
{
"Com_show_tables"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_TABLES
),
SHOW_LONG
},
{
"Com_show_tables"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_TABLES
),
SHOW_LONG
},
{
"Com_show_variables"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_VARIABLES
),
SHOW_LONG
},
{
"Com_show_variables"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SHOW_VARIABLES
),
SHOW_LONG
},
{
"Com_slave_start"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SLAVE_START
),
SHOW_LONG
},
{
"Com_slave_start"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_SLAVE_START
),
SHOW_LONG
},
...
@@ -4503,11 +4503,11 @@ struct show_var_st status_vars[]= {
...
@@ -4503,11 +4503,11 @@ struct show_var_st status_vars[]= {
{
"Com_update_multi"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_MULTI_UPDATE
),
SHOW_LONG
},
{
"Com_update_multi"
,
(
char
*
)
(
com_stat
+
(
uint
)
SQLCOM_MULTI_UPDATE
),
SHOW_LONG
},
{
"Connections"
,
(
char
*
)
&
thread_id
,
SHOW_LONG_CONST
},
{
"Connections"
,
(
char
*
)
&
thread_id
,
SHOW_LONG_CONST
},
{
"Created_tmp_disk_tables"
,
(
char
*
)
&
created_tmp_disk_tables
,
SHOW_LONG
},
{
"Created_tmp_disk_tables"
,
(
char
*
)
&
created_tmp_disk_tables
,
SHOW_LONG
},
{
"Created_tmp_tables"
,
(
char
*
)
&
created_tmp_tables
,
SHOW_LONG
},
{
"Created_tmp_files"
,
(
char
*
)
&
my_tmp_file_created
,
SHOW_LONG
},
{
"Created_tmp_files"
,
(
char
*
)
&
my_tmp_file_created
,
SHOW_LONG
},
{
"Created_tmp_tables"
,
(
char
*
)
&
created_tmp_tables
,
SHOW_LONG
},
{
"Delayed_errors"
,
(
char
*
)
&
delayed_insert_errors
,
SHOW_LONG
},
{
"Delayed_insert_threads"
,
(
char
*
)
&
delayed_insert_threads
,
SHOW_LONG_CONST
},
{
"Delayed_insert_threads"
,
(
char
*
)
&
delayed_insert_threads
,
SHOW_LONG_CONST
},
{
"Delayed_writes"
,
(
char
*
)
&
delayed_insert_writes
,
SHOW_LONG
},
{
"Delayed_writes"
,
(
char
*
)
&
delayed_insert_writes
,
SHOW_LONG
},
{
"Delayed_errors"
,
(
char
*
)
&
delayed_insert_errors
,
SHOW_LONG
},
{
"Flush_commands"
,
(
char
*
)
&
refresh_version
,
SHOW_LONG_CONST
},
{
"Flush_commands"
,
(
char
*
)
&
refresh_version
,
SHOW_LONG_CONST
},
{
"Handler_commit"
,
(
char
*
)
&
ha_commit_count
,
SHOW_LONG
},
{
"Handler_commit"
,
(
char
*
)
&
ha_commit_count
,
SHOW_LONG
},
{
"Handler_delete"
,
(
char
*
)
&
ha_delete_count
,
SHOW_LONG
},
{
"Handler_delete"
,
(
char
*
)
&
ha_delete_count
,
SHOW_LONG
},
...
@@ -4526,26 +4526,26 @@ struct show_var_st status_vars[]= {
...
@@ -4526,26 +4526,26 @@ struct show_var_st status_vars[]= {
{
"Key_write_requests"
,
(
char
*
)
&
_my_cache_w_requests
,
SHOW_LONG
},
{
"Key_write_requests"
,
(
char
*
)
&
_my_cache_w_requests
,
SHOW_LONG
},
{
"Key_writes"
,
(
char
*
)
&
_my_cache_write
,
SHOW_LONG
},
{
"Key_writes"
,
(
char
*
)
&
_my_cache_write
,
SHOW_LONG
},
{
"Max_used_connections"
,
(
char
*
)
&
max_used_connections
,
SHOW_LONG
},
{
"Max_used_connections"
,
(
char
*
)
&
max_used_connections
,
SHOW_LONG
},
{
"Not_flushed_key_blocks"
,
(
char
*
)
&
_my_blocks_changed
,
SHOW_LONG_CONST
},
{
"Not_flushed_delayed_rows"
,
(
char
*
)
&
delayed_rows_in_use
,
SHOW_LONG_CONST
},
{
"Not_flushed_delayed_rows"
,
(
char
*
)
&
delayed_rows_in_use
,
SHOW_LONG_CONST
},
{
"
Open_tables"
,
(
char
*
)
0
,
SHOW_OPENTABLES
},
{
"
Not_flushed_key_blocks"
,
(
char
*
)
&
_my_blocks_changed
,
SHOW_LONG_CONST
},
{
"Open_files"
,
(
char
*
)
&
my_file_opened
,
SHOW_LONG_CONST
},
{
"Open_files"
,
(
char
*
)
&
my_file_opened
,
SHOW_LONG_CONST
},
{
"Open_streams"
,
(
char
*
)
&
my_stream_opened
,
SHOW_LONG_CONST
},
{
"Open_streams"
,
(
char
*
)
&
my_stream_opened
,
SHOW_LONG_CONST
},
{
"Open_tables"
,
(
char
*
)
0
,
SHOW_OPENTABLES
},
{
"Opened_tables"
,
(
char
*
)
&
opened_tables
,
SHOW_LONG
},
{
"Opened_tables"
,
(
char
*
)
&
opened_tables
,
SHOW_LONG
},
{
"Questions"
,
(
char
*
)
0
,
SHOW_QUESTION
},
#ifdef HAVE_QUERY_CACHE
#ifdef HAVE_QUERY_CACHE
{
"Qcache_queries_in_cache"
,
(
char
*
)
&
query_cache
.
queries_in_cache
,
SHOW_LONG_CONST
},
{
"Qcache_free_blocks"
,
(
char
*
)
&
query_cache
.
free_memory_blocks
,
{
"Qcache_inserts"
,
(
char
*
)
&
query_cache
.
inserts
,
SHOW_LONG
},
SHOW_LONG_CONST
},
{
"Qcache_free_memory"
,
(
char
*
)
&
query_cache
.
free_memory
,
SHOW_LONG_CONST
},
{
"Qcache_hits"
,
(
char
*
)
&
query_cache
.
hits
,
SHOW_LONG
},
{
"Qcache_hits"
,
(
char
*
)
&
query_cache
.
hits
,
SHOW_LONG
},
{
"Qcache_inserts"
,
(
char
*
)
&
query_cache
.
inserts
,
SHOW_LONG
},
{
"Qcache_lowmem_prunes"
,
(
char
*
)
&
query_cache
.
lowmem_prunes
,
SHOW_LONG
},
{
"Qcache_lowmem_prunes"
,
(
char
*
)
&
query_cache
.
lowmem_prunes
,
SHOW_LONG
},
{
"Qcache_not_cached"
,
(
char
*
)
&
query_cache
.
refused
,
SHOW_LONG
},
{
"Qcache_not_cached"
,
(
char
*
)
&
query_cache
.
refused
,
SHOW_LONG
},
{
"Qcache_free_memory"
,
(
char
*
)
&
query_cache
.
free_memory
,
{
"Qcache_queries_in_cache"
,
(
char
*
)
&
query_cache
.
queries_in_cache
,
SHOW_LONG_CONST
},
SHOW_LONG_CONST
},
{
"Qcache_free_blocks"
,
(
char
*
)
&
query_cache
.
free_memory_blocks
,
SHOW_LONG_CONST
},
{
"Qcache_total_blocks"
,
(
char
*
)
&
query_cache
.
total_blocks
,
{
"Qcache_total_blocks"
,
(
char
*
)
&
query_cache
.
total_blocks
,
SHOW_LONG_CONST
},
SHOW_LONG_CONST
},
#endif
/*HAVE_QUERY_CACHE*/
#endif
/*HAVE_QUERY_CACHE*/
{
"Questions"
,
(
char
*
)
0
,
SHOW_QUESTION
},
{
"Rpl_status"
,
(
char
*
)
0
,
SHOW_RPL_STATUS
},
{
"Rpl_status"
,
(
char
*
)
0
,
SHOW_RPL_STATUS
},
{
"Select_full_join"
,
(
char
*
)
&
select_full_join_count
,
SHOW_LONG
},
{
"Select_full_join"
,
(
char
*
)
&
select_full_join_count
,
SHOW_LONG
},
{
"Select_full_range_join"
,
(
char
*
)
&
select_full_range_join_count
,
SHOW_LONG
},
{
"Select_full_range_join"
,
(
char
*
)
&
select_full_range_join_count
,
SHOW_LONG
},
...
@@ -4561,35 +4561,35 @@ struct show_var_st status_vars[]= {
...
@@ -4561,35 +4561,35 @@ struct show_var_st status_vars[]= {
{
"Sort_rows"
,
(
char
*
)
&
filesort_rows
,
SHOW_LONG
},
{
"Sort_rows"
,
(
char
*
)
&
filesort_rows
,
SHOW_LONG
},
{
"Sort_scan"
,
(
char
*
)
&
filesort_scan_count
,
SHOW_LONG
},
{
"Sort_scan"
,
(
char
*
)
&
filesort_scan_count
,
SHOW_LONG
},
#ifdef HAVE_OPENSSL
#ifdef HAVE_OPENSSL
{
"Ssl_accept_renegotiates"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE
},
{
"Ssl_accepts"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_ACCEPT
},
{
"Ssl_accepts"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_ACCEPT
},
{
"Ssl_callback_cache_hits"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CB_HITS
},
{
"Ssl_cipher"
,
(
char
*
)
0
,
SHOW_SSL_GET_CIPHER
},
{
"Ssl_cipher_list"
,
(
char
*
)
0
,
SHOW_SSL_GET_CIPHER_LIST
},
{
"Ssl_client_connects"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CONNECT
},
{
"Ssl_connect_renegotiates"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE
},
{
"Ssl_ctx_verify_depth"
,
(
char
*
)
0
,
SHOW_SSL_CTX_GET_VERIFY_DEPTH
},
{
"Ssl_ctx_verify_mode"
,
(
char
*
)
0
,
SHOW_SSL_CTX_GET_VERIFY_MODE
},
{
"Ssl_default_timeout"
,
(
char
*
)
0
,
SHOW_SSL_GET_DEFAULT_TIMEOUT
},
{
"Ssl_finished_accepts"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_ACCEPT_GOOD
},
{
"Ssl_finished_accepts"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_ACCEPT_GOOD
},
{
"Ssl_finished_connects"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CONNECT_GOOD
},
{
"Ssl_finished_connects"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CONNECT_GOOD
},
{
"Ssl_accept_renegotiates"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE
},
{
"Ssl_connect_renegotiates"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE
},
{
"Ssl_callback_cache_hits"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CB_HITS
},
{
"Ssl_session_cache_hits"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_HITS
},
{
"Ssl_session_cache_hits"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_HITS
},
{
"Ssl_session_cache_misses"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_MISSES
},
{
"Ssl_session_cache_misses"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_MISSES
},
{
"Ssl_session_cache_timeouts"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_TIMEOUTS
},
{
"Ssl_session_cache_mode"
,
(
char
*
)
0
,
SHOW_SSL_CTX_GET_SESSION_CACHE_MODE
},
{
"Ssl_used_session_cache_entries"
,(
char
*
)
0
,
SHOW_SSL_CTX_SESS_NUMBER
},
{
"Ssl_client_connects"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CONNECT
},
{
"Ssl_session_cache_overflows"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CACHE_FULL
},
{
"Ssl_session_cache_overflows"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_CACHE_FULL
},
{
"Ssl_session_cache_size"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_GET_CACHE_SIZE
},
{
"Ssl_session_cache_size"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_GET_CACHE_SIZE
},
{
"Ssl_session_cache_
mode"
,
(
char
*
)
0
,
SHOW_SSL_CTX_GET_SESSION_CACHE_MODE
},
{
"Ssl_session_cache_
timeouts"
,
(
char
*
)
0
,
SHOW_SSL_CTX_SESS_TIMEOUTS
},
{
"Ssl_sessions_reused"
,
(
char
*
)
0
,
SHOW_SSL_SESSION_REUSED
},
{
"Ssl_sessions_reused"
,
(
char
*
)
0
,
SHOW_SSL_SESSION_REUSED
},
{
"Ssl_ctx_verify_mode"
,
(
char
*
)
0
,
SHOW_SSL_CTX_GET_VERIFY_MODE
},
{
"Ssl_used_session_cache_entries"
,(
char
*
)
0
,
SHOW_SSL_CTX_SESS_NUMBER
},
{
"Ssl_ctx_verify_depth"
,
(
char
*
)
0
,
SHOW_SSL_CTX_GET_VERIFY_DEPTH
},
{
"Ssl_verify_mode"
,
(
char
*
)
0
,
SHOW_SSL_GET_VERIFY_MODE
},
{
"Ssl_verify_depth"
,
(
char
*
)
0
,
SHOW_SSL_GET_VERIFY_DEPTH
},
{
"Ssl_verify_depth"
,
(
char
*
)
0
,
SHOW_SSL_GET_VERIFY_DEPTH
},
{
"Ssl_verify_mode"
,
(
char
*
)
0
,
SHOW_SSL_GET_VERIFY_MODE
},
{
"Ssl_version"
,
(
char
*
)
0
,
SHOW_SSL_GET_VERSION
},
{
"Ssl_version"
,
(
char
*
)
0
,
SHOW_SSL_GET_VERSION
},
{
"Ssl_cipher"
,
(
char
*
)
0
,
SHOW_SSL_GET_CIPHER
},
{
"Ssl_cipher_list"
,
(
char
*
)
0
,
SHOW_SSL_GET_CIPHER_LIST
},
{
"Ssl_default_timeout"
,
(
char
*
)
0
,
SHOW_SSL_GET_DEFAULT_TIMEOUT
},
#endif
/* HAVE_OPENSSL */
#endif
/* HAVE_OPENSSL */
{
"Table_locks_immediate"
,
(
char
*
)
&
locks_immediate
,
SHOW_LONG
},
{
"Table_locks_immediate"
,
(
char
*
)
&
locks_immediate
,
SHOW_LONG
},
{
"Table_locks_waited"
,
(
char
*
)
&
locks_waited
,
SHOW_LONG
},
{
"Table_locks_waited"
,
(
char
*
)
&
locks_waited
,
SHOW_LONG
},
{
"Threads_cached"
,
(
char
*
)
&
cached_thread_count
,
SHOW_LONG_CONST
},
{
"Threads_cached"
,
(
char
*
)
&
cached_thread_count
,
SHOW_LONG_CONST
},
{
"Threads_created"
,
(
char
*
)
&
thread_created
,
SHOW_LONG_CONST
},
{
"Threads_connected"
,
(
char
*
)
&
thread_count
,
SHOW_INT_CONST
},
{
"Threads_connected"
,
(
char
*
)
&
thread_count
,
SHOW_INT_CONST
},
{
"Threads_created"
,
(
char
*
)
&
thread_created
,
SHOW_LONG_CONST
},
{
"Threads_running"
,
(
char
*
)
&
thread_running
,
SHOW_INT_CONST
},
{
"Threads_running"
,
(
char
*
)
&
thread_running
,
SHOW_INT_CONST
},
{
"Uptime"
,
(
char
*
)
0
,
SHOW_STARTTIME
},
{
"Uptime"
,
(
char
*
)
0
,
SHOW_STARTTIME
},
{
NullS
,
NullS
,
SHOW_LONG
}
{
NullS
,
NullS
,
SHOW_LONG
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment