summaryrefslogtreecommitdiff
path: root/client/mysql_upgrade.c
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
commit72b2943594036ce9f737dbe81cf32505970fd063 (patch)
treead3ff84791c35c7d8b2d47a60f0ea4cb409a0a31 /client/mysql_upgrade.c
parent69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4 (diff)
parentb358f61bc76e79e872c587bda7f953180a01125e (diff)
downloadmariadb-git-72b2943594036ce9f737dbe81cf32505970fd063.tar.gz
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'client/mysql_upgrade.c')
-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);
}