diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-15 04:40:08 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-15 04:40:08 +0200 |
| commit | a3eda4e3982ad3267a818de654555d84573b4dcb (patch) | |
| tree | 2231bba049ab597515c7b15f4060f8ca4749053a /sql | |
| parent | 2a91b534d365c92537372185daf2de4d320c6e87 (diff) | |
| parent | b0c693353df58a11ad1c1b4a68140a6bdc4eb6b1 (diff) | |
| download | mariadb-git-a3eda4e3982ad3267a818de654555d84573b4dcb.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 19d6ffe19c7..c014f75fb84 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3095,7 +3095,7 @@ struct show_var_st status_vars[]= { {"Com_show_grants", (char*) (com_stat+(uint) SQLCOM_SHOW_GRANTS),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_master_STAT", (char*) (com_stat+(uint) SQLCOM_SHOW_MASTER_STAT),SHOW_LONG}, + {"Com_show_master_stat", (char*) (com_stat+(uint) SQLCOM_SHOW_MASTER_STAT),SHOW_LONG}, {"Com_show_open_tables", (char*) (com_stat+(uint) SQLCOM_SHOW_OPEN_TABLES),SHOW_LONG}, {"Com_show_processlist", (char*) (com_stat+(uint) SQLCOM_SHOW_PROCESSLIST),SHOW_LONG}, {"Com_show_slave_stat", (char*) (com_stat+(uint) SQLCOM_SHOW_SLAVE_STAT),SHOW_LONG}, |