database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed compiler warnings and test failures found by buildbot

Browse Source
This commit is contained in:
Monty
2016-06-19 15:06:10 +03:00
parent 34eb10e406
commit 838205f0bb
11 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_acl.cc
View File

@ -2910,6 +2910,15 @@ int acl_set_default_role(THD *thd, const char *host, const char *user,
safe_str(rolename), safe_str(user), safe_str(host));
}
/*
This statement will be replicated as a statement, even when using
row-based replication. The flag will be reset at the end of the
statement.
This has to be handled here as it's called by set_var.cc, which is
not automaticly handled by sql_parse.cc
*/
save_binlog_format= thd->set_current_stmt_binlog_format_stmt();
if (WSREP(thd) && !IF_WSREP(thd->wsrep_applier, 0))
{
thd->set_query_inner(buff, query_length, system_charset_info);
@ -2922,15 +2931,6 @@ int acl_set_default_role(THD *thd, const char *host, const char *user,
table= tables[USER_TABLE].table;
result= 1;
/*
This statement will be replicated as a statement, even when using
row-based replication. The flag will be reset at the end of the
statement.
This has to be handled here as it's called by set_var.cc, which is
not automaticly handled by sql_parse.cc
*/
save_binlog_format= thd->set_current_stmt_binlog_format_stmt();
mysql_mutex_lock(&acl_cache->lock);
ACL_USER *acl_user;
if (!(acl_user= find_user_exact(host, user)))