diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
| commit | 09942fe8e89778e8b9ab99a8f0aa941a7fc95b16 (patch) | |
| tree | c656767fe54a976ffb669926348b9fac198be312 /client | |
| parent | f0ae3168a3f2b16fd0718ca4b93533293c5deea8 (diff) | |
| parent | efe619585840b27ef156b35f2be6ef3c9809d2e5 (diff) | |
| download | mariadb-git-09942fe8e89778e8b9ab99a8f0aa941a7fc95b16.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- include/my_no_pthread.h
- mysql-test/r/sp-ucs2.result
- sql/log.cc
- sql/sql_acl.cc
- sql/sql_yacc.yy
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 1a3f61559d6..4c4820e69eb 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); } |