summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-12-11 19:40:58 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-12-11 19:40:58 +0300
commitebdef570e552b93b693398f42c229cf77ab85965 (patch)
treead3ff84791c35c7d8b2d47a60f0ea4cb409a0a31 /client
parent567671368723c704d60902b4d0ccff951b414552 (diff)
parent684c7aba09583e54c5272cc3b0eec207afc87a39 (diff)
downloadmariadb-git-ebdef570e552b93b693398f42c229cf77ab85965.tar.gz
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'client')
-rw-r--r--client/mysql_upgrade.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 05eb80e5455..a1ca70c63eb 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -783,6 +783,10 @@ static int run_sql_fix_privilege_tables(void)
found_real_errors++;
print_line(line);
}
+ else if (strncmp(line, "WARNING", 7) == 0)
+ {
+ print_line(line);
+ }
} while ((line= get_line(line)) && *line);
}