diff options
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 141e00cf50f..a7109af9f64 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -264,8 +264,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; } |