1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-10566: Create role statement replicated inconsistently in Galera Cluster

Browse Source 
In galera cluster, the definer (and thus binlog invoker) must be set
for CREATE ROLE before Query_log_event is created during TOI on the
originating node.
This commit is contained in:
Nirbhay Choubey 2016-08-24 15:32:48 -04:00
parent f381ad5230
commit 1b7c5dedf7
4 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mysql-test/suite/galera/r/galera_roles.result
View File

@ -69,8 +69,8 @@ SET ROLE role1;
FLUSH TABLES; FLUSH TABLES;
SELECT * FROM mysql.roles_mapping; SELECT * FROM mysql.roles_mapping;
Host User Role Admin_option Host User Role Admin_option
role1 Y
localhost foo role1 N localhost foo role1 N
localhost root role1 Y
SHOW TABLES FROM test1; SHOW TABLES FROM test1;
Tables_in_test1 Tables_in_test1
t1 t1
@ -153,4 +153,43 @@ role1
# Connect with node_1 # Connect with node_1
DROP USER foo@localhost; DROP USER foo@localhost;
DROP DATABASE test1; DROP DATABASE test1;
#
# MDEV-10566: Create role statement replicated inconsistently in Galera Cluster
#
# On node_1
CREATE USER foo@localhost;
CREATE ROLE role1;
CREATE ROLE role2 WITH ADMIN CURRENT_USER;
CREATE ROLE role3 WITH ADMIN foo@localhost;
CREATE ROLE role4 WITH ADMIN role1;
SELECT * FROM mysql.roles_mapping;
Host User Role Admin_option
role1 role4 Y
localhost foo role3 Y
localhost root role1 Y
localhost root role2 Y
SELECT * FROM INFORMATION_SCHEMA.APPLICABLE_ROLES;
GRANTEE ROLE_NAME IS_GRANTABLE
role1 role4 YES
root@localhost role1 YES
root@localhost role2 YES
# On node_2
SELECT * FROM mysql.roles_mapping;
Host User Role Admin_option
role1 role4 Y
localhost foo role3 Y
localhost root role1 Y
localhost root role2 Y
SELECT * FROM INFORMATION_SCHEMA.APPLICABLE_ROLES;
GRANTEE ROLE_NAME IS_GRANTABLE
role1 role4 YES
root@localhost role1 YES
root@localhost role2 YES
DROP ROLE role1;
DROP ROLE role2;
DROP ROLE role3;
DROP ROLE role4;
DROP USER foo@localhost;
# End of test # End of test

32
mysql-test/suite/galera/t/galera_roles.test
View File

@ -163,5 +163,37 @@ disconnect foo_node_2;
DROP USER foo@localhost; DROP USER foo@localhost;
DROP DATABASE test1; DROP DATABASE test1;
--echo #
--echo # MDEV-10566: Create role statement replicated inconsistently in Galera Cluster
--echo #
--echo
--echo # On node_1
--connection node_1
CREATE USER foo@localhost;
CREATE ROLE role1;
CREATE ROLE role2 WITH ADMIN CURRENT_USER;
CREATE ROLE role3 WITH ADMIN foo@localhost;
CREATE ROLE role4 WITH ADMIN role1;
--sorted_result
SELECT * FROM mysql.roles_mapping;
--sorted_result
SELECT * FROM INFORMATION_SCHEMA.APPLICABLE_ROLES;
--echo
--echo # On node_2
--connection node_2
--sorted_result
SELECT * FROM mysql.roles_mapping;
--sorted_result
SELECT * FROM INFORMATION_SCHEMA.APPLICABLE_ROLES;
# Cleanup
DROP ROLE role1;
DROP ROLE role2;
DROP ROLE role3;
DROP ROLE role4;
DROP USER foo@localhost;
--source include/galera_end.inc --source include/galera_end.inc
--echo # End of test --echo # End of test

4
sql/sql_class.cc
View File

@ -5249,7 +5249,11 @@ void THD::get_definer(LEX_USER *definer, bool role)
{ {
binlog_invoker(role); binlog_invoker(role);
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
#ifdef WITH_WSREP
if ((wsrep_applier || slave_thread) && has_invoker())
#else
if (slave_thread && has_invoker()) if (slave_thread && has_invoker())
#endif
{ {
definer->user = invoker_user; definer->user = invoker_user;
definer->host= invoker_host; definer->host= invoker_host;

6
sql/wsrep_mysqld.cc
View File

@ -1236,6 +1236,12 @@ static int wsrep_TOI_begin(THD *thd, char *db_, char *table_,
case SQLCOM_ALTER_EVENT: case SQLCOM_ALTER_EVENT:
buf_err= wsrep_alter_event_query(thd, &buf, &buf_len); buf_err= wsrep_alter_event_query(thd, &buf, &buf_len);
break; break;
case SQLCOM_CREATE_ROLE:
if (sp_process_definer(thd))
{
WSREP_WARN("Failed to set CREATE ROLE definer for TOI.");
}
/* fallthrough */
default: default:
buf_err= wsrep_to_buf_helper(thd, thd->query(), thd->query_length(), &buf, buf_err= wsrep_to_buf_helper(thd, thd->query(), thd->query_length(), &buf,
&buf_len); &buf_len);