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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
15856528
Commit
15856528
authored
Nov 11, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-5236 Status variables are not all listed alphabetically
sort Com_ counters. No simple fix for Binlog_ variables.
parent
fb46f35f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
sql/mysqld.cc
sql/mysqld.cc
+4
-4
No files found.
sql/mysqld.cc
View file @
15856528
...
...
@@ -3291,7 +3291,6 @@ static bool init_global_datetime_format(timestamp_type format_type,
SHOW_VAR
com_status_vars
[]
=
{
{
"admin_commands"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_other
),
SHOW_LONG_STATUS
},
{
"assign_to_keycache"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_ASSIGN_TO_KEYCACHE
]),
SHOW_LONG_STATUS
},
{
"alter_db"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_ALTER_DB
]),
SHOW_LONG_STATUS
},
{
"alter_db_upgrade"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_ALTER_DB_UPGRADE
]),
SHOW_LONG_STATUS
},
{
"alter_event"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_ALTER_EVENT
]),
SHOW_LONG_STATUS
},
...
...
@@ -3301,6 +3300,7 @@ SHOW_VAR com_status_vars[]= {
{
"alter_table"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_ALTER_TABLE
]),
SHOW_LONG_STATUS
},
{
"alter_tablespace"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_ALTER_TABLESPACE
]),
SHOW_LONG_STATUS
},
{
"analyze"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_ANALYZE
]),
SHOW_LONG_STATUS
},
{
"assign_to_keycache"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_ASSIGN_TO_KEYCACHE
]),
SHOW_LONG_STATUS
},
{
"begin"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_BEGIN
]),
SHOW_LONG_STATUS
},
{
"binlog"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_BINLOG_BASE64_EVENT
]),
SHOW_LONG_STATUS
},
{
"call_procedure"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_CALL
]),
SHOW_LONG_STATUS
},
...
...
@@ -3368,7 +3368,6 @@ SHOW_VAR com_status_vars[]= {
{
"savepoint"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SAVEPOINT
]),
SHOW_LONG_STATUS
},
{
"select"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SELECT
]),
SHOW_LONG_STATUS
},
{
"set_option"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SET_OPTION
]),
SHOW_LONG_STATUS
},
{
"signal"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SIGNAL
]),
SHOW_LONG_STATUS
},
{
"show_authors"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_AUTHORS
]),
SHOW_LONG_STATUS
},
{
"show_binlog_events"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_BINLOG_EVENTS
]),
SHOW_LONG_STATUS
},
{
"show_binlogs"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_BINLOGS
]),
SHOW_LONG_STATUS
},
...
...
@@ -3386,16 +3385,16 @@ SHOW_VAR com_status_vars[]= {
{
"show_engine_logs"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_ENGINE_LOGS
]),
SHOW_LONG_STATUS
},
{
"show_engine_mutex"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_ENGINE_MUTEX
]),
SHOW_LONG_STATUS
},
{
"show_engine_status"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_ENGINE_STATUS
]),
SHOW_LONG_STATUS
},
{
"show_events"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_EVENTS
]),
SHOW_LONG_STATUS
},
{
"show_errors"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_ERRORS
]),
SHOW_LONG_STATUS
},
{
"show_events"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_EVENTS
]),
SHOW_LONG_STATUS
},
{
"show_fields"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_FIELDS
]),
SHOW_LONG_STATUS
},
#ifndef DBUG_OFF
{
"show_function_code"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_FUNC_CODE
]),
SHOW_LONG_STATUS
},
#endif
{
"show_function_status"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_STATUS_FUNC
]),
SHOW_LONG_STATUS
},
{
"show_grants"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_GRANTS
]),
SHOW_LONG_STATUS
},
{
"show_keys"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_KEYS
]),
SHOW_LONG_STATUS
},
{
"show_index_statistics"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_INDEX_STATS
]),
SHOW_LONG_STATUS
},
{
"show_keys"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_KEYS
]),
SHOW_LONG_STATUS
},
{
"show_master_status"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_MASTER_STAT
]),
SHOW_LONG_STATUS
},
{
"show_open_tables"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_OPEN_TABLES
]),
SHOW_LONG_STATUS
},
{
"show_plugins"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_PLUGINS
]),
SHOW_LONG_STATUS
},
...
...
@@ -3419,6 +3418,7 @@ SHOW_VAR com_status_vars[]= {
{
"show_user_statistics"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_USER_STATS
]),
SHOW_LONG_STATUS
},
{
"show_variables"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_VARIABLES
]),
SHOW_LONG_STATUS
},
{
"show_warnings"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SHOW_WARNS
]),
SHOW_LONG_STATUS
},
{
"signal"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SIGNAL
]),
SHOW_LONG_STATUS
},
{
"slave_start"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SLAVE_START
]),
SHOW_LONG_STATUS
},
{
"slave_stop"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stat
[(
uint
)
SQLCOM_SLAVE_STOP
]),
SHOW_LONG_STATUS
},
{
"stmt_close"
,
(
char
*
)
offsetof
(
STATUS_VAR
,
com_stmt_close
),
SHOW_LONG_STATUS
},
...
...
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