diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-03-15 12:51:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-03-15 12:51:23 +0100 |
| commit | f09ca00e088b316441bb76e97ba097bc9f3da7d3 (patch) | |
| tree | 1a557d74018ed9cd073b5aa960bd62421962e73d /sql/sql_servers.cc | |
| parent | 2ceaffc4672c62a772890da7761d11f13d3f5ee4 (diff) | |
| parent | 71b3e46b0160936596195682a731703900fb4fff (diff) | |
| download | mariadb-git-f09ca00e088b316441bb76e97ba097bc9f3da7d3.tar.gz | |
merged
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 58622699984..b88320ed2bf 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -241,8 +241,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->main_da.message()); + /* + Execution might have been interrupted; only print the error message + if an error condition has been raised. + */ + if (thd->main_da.is_error()) + sql_print_error("Can't open and lock privilege tables: %s", + thd->main_da.message()); + return_val= FALSE; goto end; } |