summaryrefslogtreecommitdiff
path: root/client/mysqlcheck.c
diff options
context:
space:
mode:
authorunknown <ramil/ram@ramil.myoffice.izhnet.ru>2007-10-31 11:40:53 +0400
committerunknown <ramil/ram@ramil.myoffice.izhnet.ru>2007-10-31 11:40:53 +0400
commitef19210e5f606f79285544925207bcb3cee26d3a (patch)
tree245071aa1782b41027ffd023ca653abe453e473a /client/mysqlcheck.c
parent042963d56bc0fa4f44ad9f9bc21b4c28da16f625 (diff)
parentd4befc1dca23d4ed535a4eb2f82700b54702375b (diff)
downloadmariadb-git-ef19210e5f606f79285544925207bcb3cee26d3a.tar.gz
Merge mysql.com:/home/ram/work/mysql-5.1-maint
into mysql.com:/home/ram/work/b30679/b30679.5.1 client/mysqlcheck.c: Auto merged mysql-test/r/mysqlcheck.result: Auto merged mysql-test/t/mysqlcheck.test: Auto merged
Diffstat (limited to 'client/mysqlcheck.c')
-rw-r--r--client/mysqlcheck.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index e5a5e121d74..3350bfa17a7 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -557,8 +557,11 @@ static int process_all_tables_in_db(char *database)
else
{
while ((row = mysql_fetch_row(res)))
- /* Skip tables with an engine of NULL (probably a view). */
- if (row[1])
+ /*
+ Skip tables with an engine of NULL (probably a view)
+ if we don't perform renaming.
+ */
+ if (row[1] || what_to_do == DO_UPGRADE)
{
handle_request_for_tables(row[0], fixed_name_length(row[0]));
}