summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-05-01 23:10:55 +0200
committerserg@serg.mylan <>2005-05-01 23:10:55 +0200
commit530b6ba541b99d9aced0e47e70ed41b6cafabdfe (patch)
tree0a41aa330429f40b1c6866922006bfb0cb59b1ef /client
parent9c332d8d2a09782ebc773387556f85e63433cd1d (diff)
parentc83b78169e52a40241d0dc0e88cddbd84420c572 (diff)
downloadmariadb-git-530b6ba541b99d9aced0e47e70ed41b6cafabdfe.tar.gz
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'client')
-rw-r--r--client/mysqladmin.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index 1eec9bc2555..32e0dfdb837 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),