diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-08-12 11:47:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-08-12 12:02:23 +0200 |
| commit | 0aa9b03393f515d7b07c3139756c2a9270501c97 (patch) | |
| tree | 074514d29d2db5045db04fb838506b3eb5d456e9 /sql/sql_acl.cc | |
| parent | 655cba619d2e6556d4a7c6a3b9127f248bb8e5a0 (diff) | |
| parent | 4cbf77e16ef9324acf85c01bc63023d62b821752 (diff) | |
| download | mariadb-git-0aa9b03393f515d7b07c3139756c2a9270501c97.tar.gz | |
Merge branch '10.2' into 10.3
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 a28dcd5addd..88d1630d94b 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3362,7 +3362,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"); @@ -3402,6 +3403,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); } |