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 | a72f90bc43a809e6678e1343a1ee760878061be3 (patch) | |
| tree | 16fe2efa0a3d5e40e00972a1dc3bc4e13f71170c /sql/sql_servers.cc | |
| parent | ba678eef7de4a8c5fbea07928b87fef84765f22b (diff) | |
| parent | b38ef2b5f7bc231b63b770c28688ee9f0109c88b (diff) | |
| download | mariadb-git-a72f90bc43a809e6678e1343a1ee760878061be3.tar.gz | |
Merge next-mr -> next-4284.
mysql-test/t/disabled.def:
Restore disabled ssl tests: SSL certificates were updated.
Disable sp_sync.test, the test case can't work in next-4284.
mysql-test/t/partition_innodb.test:
Disable parsing of the test case for Bug#47343,
the test can not work in next-4284.
mysql-test/t/ps_ddl.test:
Update results (CREATE TABLE IF NOT EXISTS takes
into account existence of the temporary table).
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; } |