diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
| commit | 4aa9d903c11554cc4887eeffe7f0592c52e8bc99 (patch) | |
| tree | af3f0dfb833c3c4aabaa69ce50cfb64202ecd479 /sql/sql_acl.cc | |
| parent | 9febcb4776e563a93eb8fff247174b0e2eb2ae0b (diff) | |
| parent | af6d89a6aa9feb3545de068f461cf91bfb281dd2 (diff) | |
| download | mariadb-git-4aa9d903c11554cc4887eeffe7f0592c52e8bc99.tar.gz | |
Merge with MySQL 5.1.47
Fixed some bugs introduced in 5.1.47
Disabled some tests until we have merged with latest Xtradb
configure.in:
Added testing if valgrind/memcheck.h exists
storage/pbxt/src/ha_pbxt.cc:
LOCK_plugin is not anymore locked in init
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 e285ff55556..6e9ec902577 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -6118,19 +6118,19 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list) VOID(pthread_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()); rw_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 */ thd->current_stmt_binlog_row_based= save_binlog_row_based; - DBUG_RETURN(result || binlog_error); + DBUG_RETURN(result); } |