diff options
| author | unknown <serg@serg.mylan> | 2005-05-01 23:10:55 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-01 23:10:55 +0200 |
| commit | 9b512475fcd3056682b7a2eb0a1d3fc5ff041eb3 (patch) | |
| tree | 0a41aa330429f40b1c6866922006bfb0cb59b1ef /client/mysqladmin.cc | |
| parent | d3d56609520700ce6f0490007cd4c01870bc7fd6 (diff) | |
| parent | 21eed96b0261a6c6eff4f8df1493a0e57decf2bb (diff) | |
| download | mariadb-git-9b512475fcd3056682b7a2eb0a1d3fc5ff041eb3.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 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), |