diff options
| author | unknown <monty@mysql.com> | 2005-04-30 03:46:38 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-30 03:46:38 +0300 |
| commit | 66bea0de157e07df6e1a3408d1d3c6f0c3177c7e (patch) | |
| tree | 8c0876b4d6e65974ff6a2ce510b69333467dc8e0 /client | |
| parent | e9cc39c43f5e6bb38f11e0a50fb7f55acb85cc6b (diff) | |
| parent | ac82a2d5eb0f183b27ddc3417b3b33899ef17bf5 (diff) | |
| download | mariadb-git-66bea0de157e07df6e1a3408d1d3c6f0c3177c7e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
Diffstat (limited to 'client')
| -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), |