summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorJim Winstead <jimw@mysql.com>2009-05-20 18:31:10 -0700
committerJim Winstead <jimw@mysql.com>2009-05-20 18:31:10 -0700
commitf0f4efd77e3eb7d62176396b5ccf53d7a7029c85 (patch)
tree8bbcf7fdd84e32f5d82edf7346379e4db4e0a539 /client
parentd57bb98ff5c62fff7d9912dd0a96ad99fcab3861 (diff)
downloadmariadb-git-f0f4efd77e3eb7d62176396b5ccf53d7a7029c85.tar.gz
mysqlcheck failed to fix table names when using the --fix-table-names
and --all-in-1 options together. (Bug #31821)
Diffstat (limited to 'client')
-rw-r--r--client/mysqlcheck.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 1bdb28f5a11..83d2006b597 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`