diff options
| author | unknown <monty@mysql.com> | 2005-04-27 17:16:08 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-27 17:16:08 +0300 |
| commit | 0e1e0ddf23a9aa89ee89022bd018f3eb47e84d86 (patch) | |
| tree | 1659e377a1ee83ee3fe2a8d2ccbd1ec06f8643ee /client/mysqladmin.cc | |
| parent | 81e8630e2fb55dbd4da7cf4e4c20b44223d80857 (diff) | |
| download | mariadb-git-0e1e0ddf23a9aa89ee89022bd018f3eb47e84d86.tar.gz | |
mysqladmin extended-status now displays global status
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
client/mysqladmin.cc:
Show GLOBAL status
myisam/mi_key.c:
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
(Ramil will soon push test cases)
sql/handler.cc:
Indentation fix
tests/mysql_client_test.c:
Portability fixes
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 24fe14b6675..c6274e499ab 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -727,7 +727,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) void (*func) (MYSQL_RES*, MYSQL_ROW, uint); new_line = 1; - if (mysql_query(mysql, "show status") || + if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") || !(res = mysql_store_result(mysql))) { my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL), |