diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
| commit | 9c030fe5081163babdc8ef24395d108a394107fe (patch) | |
| tree | 16fe2efa0a3d5e40e00972a1dc3bc4e13f71170c /sql/sql_servers.cc | |
| parent | 0b2f51664d38ed24f3f8b237877520e45bfe83f6 (diff) | |
| parent | 19df110369d4cef5303176a8aedca34cd0e2d271 (diff) | |
| download | mariadb-git-9c030fe5081163babdc8ef24395d108a394107fe.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 7b03891aff8..0af076d6102 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -255,8 +255,14 @@ bool servers_reload(THD *thd) if (simple_open_n_lock_tables(thd, tables)) { - sql_print_error("Can't open and lock privilege tables: %s", - thd->stmt_da->message()); + /* + Execution might have been interrupted; only print the error message + if an error condition has been raised. + */ + if (thd->stmt_da->is_error()) + sql_print_error("Can't open and lock privilege tables: %s", + thd->stmt_da->message()); + return_val= FALSE; goto end; } |