summaryrefslogtreecommitdiff
path: root/client/mysqlcheck.c
diff options
context:
space:
mode:
authorJim Winstead <jimw@mysql.com>2009-07-14 10:08:38 -0700
committerJim Winstead <jimw@mysql.com>2009-07-14 10:08:38 -0700
commit1286d0f3f92784ddadc55f68707b45dbc6922aa2 (patch)
tree621df211e8838b5cbacf88d7e41019a2401d4f4f /client/mysqlcheck.c
parented3b0a69cfbc5778f000df4d2e46baa1f1173c57 (diff)
parentf0f4efd77e3eb7d62176396b5ccf53d7a7029c85 (diff)
downloadmariadb-git-1286d0f3f92784ddadc55f68707b45dbc6922aa2.tar.gz
Merge in bug fixes for client tools
Diffstat (limited to 'client/mysqlcheck.c')
-rw-r--r--client/mysqlcheck.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index c59049d8b72..82aabd77b24 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -442,7 +442,7 @@ static int process_selected_tables(char *db, char **table_names, int tables)
{
if (use_db(db))
return 1;
- if (opt_all_in_1)
+ if (opt_all_in_1 && what_to_do != DO_UPGRADE)
{
/*
We need table list in form `a`, `b`, `c`
@@ -536,7 +536,7 @@ static int process_all_tables_in_db(char *database)
num_columns= mysql_num_fields(res);
- if (opt_all_in_1)
+ if (opt_all_in_1 && what_to_do != DO_UPGRADE)
{
/*
We need table list in form `a`, `b`, `c`