diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-08-03 23:26:26 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-08-03 23:26:26 +0200 |
| commit | affdd79c69dfe443cb9fda06ef156243e1967ac3 (patch) | |
| tree | 75ebc329bbe3d6714e333335d590ecfebd12679e /sql/sql_acl.cc | |
| parent | e6a808bec790fdbbf1dc0a6b03fb6c8b6e41dc01 (diff) | |
| parent | 701f0b8e366f957e8256e4741ca48424c84b7234 (diff) | |
| download | mariadb-git-affdd79c69dfe443cb9fda06ef156243e1967ac3.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index f5c422cc5ea..75186bb502c 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3460,7 +3460,8 @@ int acl_set_default_role(THD *thd, const char *host, const char *user, ulong query_length= 0; bool clear_role= FALSE; char buff[512]; - enum_binlog_format save_binlog_format; + enum_binlog_format save_binlog_format= + thd->get_current_stmt_binlog_format(); const CSET_STRING query_save __attribute__((unused)) = thd->query_string; DBUG_ENTER("acl_set_default_role"); @@ -3500,6 +3501,7 @@ int acl_set_default_role(THD *thd, const char *host, const char *user, if (WSREP(thd) && !IF_WSREP(thd->wsrep_applier, 0)) { thd->set_query(buff, query_length, system_charset_info); + // Attention!!! here is implicit goto error; WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, (char*)"user", NULL); } |