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 | f8b4629cf728072b230159718994f585145b4ce2 (patch) | |
| tree | 2231bba049ab597515c7b15f4060f8ca4749053a | |
| parent | 85a8f75a7d52e9c37f787a2dbea496e73a2e0043 (diff) | |
| parent | 1f39a9295a37618b602997d26a152e6bc4ba8754 (diff) | |
| download | mariadb-git-f8b4629cf728072b230159718994f585145b4ce2.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
sql/mysqld.cc:
Auto merged
| -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}, |