diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-01-15 11:06:46 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-01-15 11:06:46 +0200 |
| commit | 0305aea88a220ff9080432a65d50cb30493f3109 (patch) | |
| tree | 2be501ad47ff01efe5af595410e222a3ee873214 /sql/sql_servers.cc | |
| parent | a07ca23755affd5ad164323593f13a4fa708b9ad (diff) | |
| parent | 32aa612819ff756b284e639de50627b3d6d7fa0d (diff) | |
| download | mariadb-git-0305aea88a220ff9080432a65d50cb30493f3109.tar.gz | |
merge
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 f8a8dea18ff..1655426bb4a 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; } |