diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-28 09:47:58 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-28 09:47:58 +0400 |
| commit | 59a99129634a020bc618324db1c36f36f9e14493 (patch) | |
| tree | 88543c956886365a2376e01ce26a0436c38a4454 /sql/sql_acl.cc | |
| parent | 7758bdc8aad36927db408b4bc9546d39ef646c3c (diff) | |
| parent | eb27f163a31ca6995c98ada9fc678176c041dd93 (diff) | |
| download | mariadb-git-59a99129634a020bc618324db1c36f36f9e14493.tar.gz | |
Auto-merge from mysql-trunk.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 55d83f49245..ec25e4cb68b 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -6261,21 +6261,21 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list) mysql_mutex_unlock(&acl_cache->lock); - int binlog_error= + if (result) + my_message(ER_REVOKE_GRANTS, ER(ER_REVOKE_GRANTS), MYF(0)); + + result= result | write_bin_log(thd, FALSE, thd->query(), thd->query_length()); mysql_rwlock_unlock(&LOCK_grant); close_thread_tables(thd); - /* error for writing binary log has already been reported */ - if (result && !binlog_error) - my_message(ER_REVOKE_GRANTS, ER(ER_REVOKE_GRANTS), MYF(0)); /* Restore the state of binlog format */ DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row()); if (save_binlog_row_based) thd->set_current_stmt_binlog_format_row(); - DBUG_RETURN(result || binlog_error); + DBUG_RETURN(result); } |