diff options
author | Ramil Kalimullin <ramil@mysql.com> | 2008-11-14 13:48:01 +0400 |
---|---|---|
committer | Ramil Kalimullin <ramil@mysql.com> | 2008-11-14 13:48:01 +0400 |
commit | de1fe9054fd2dfd419c47b73ea4f3c255a4dd41a (patch) | |
tree | 1992a3b85335202efceda500a25717c05118e864 /client/mysqlcheck.c | |
parent | b3de270125bf630aab5da32e130e8e812fdf93f0 (diff) | |
parent | ee3594b2d7294bc59297307367e759d03ae02805 (diff) | |
download | mariadb-git-de1fe9054fd2dfd419c47b73ea4f3c255a4dd41a.tar.gz |
Auto-merge
Diffstat (limited to 'client/mysqlcheck.c')
-rw-r--r-- | client/mysqlcheck.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index e71cf70d882..17ebca497e4 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -517,9 +517,14 @@ static int process_all_tables_in_db(char *database) LINT_INIT(res); if (use_db(database)) return 1; - if (mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") || - !((res= mysql_store_result(sock)))) + if ((mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") && + mysql_query(sock, "SHOW TABLES")) || + !(res= mysql_store_result(sock))) + { + my_printf_error(0, "Error: Couldn't get table list for database %s: %s", + MYF(0), database, mysql_error(sock)); return 1; + } num_columns= mysql_num_fields(res); |