Merge pull request #2046 from kamil-holubicki/PXC-4469-squashed

PXC-4469: Implement CLONE method for SST

mysql-test/r/mysql_upgrade.result

@@ -103,7 +103,7 @@ GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS for 'mysql.pxc.internal.session'@localhost;
 Grants for mysql.pxc.internal.session@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `mysql.pxc.internal.session`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SENSITIVE_VARIABLES_OBSERVER,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,TELEMETRY_LOG_ADMIN,XA_RECOVER_ADMIN ON *.* TO `mysql.pxc.internal.session`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ABORT_EXEMPT,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FIREWALL_EXEMPT,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SENSITIVE_VARIABLES_OBSERVER,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,TELEMETRY_LOG_ADMIN,XA_RECOVER_ADMIN ON *.* TO `mysql.pxc.internal.session`@`localhost` WITH GRANT OPTION
 DROP USER u34068378;
 
 End of tests

mysql-test/r/mysqld--help-notwin.result

@@ -2436,7 +2436,7 @@ wsrep-retry-autocommit 1
 wsrep-slave-FK-checks TRUE
 wsrep-slave-UK-checks FALSE
 wsrep-slave-threads 1
-wsrep-sst-allowed-methods xtrabackup-v2
+wsrep-sst-allowed-methods xtrabackup-v2,clone
 wsrep-sst-donor 
 wsrep-sst-donor-rejects-queries FALSE
 wsrep-sst-method xtrabackup-v2

mysql-test/r/ps_sys_upgrade.result

@@ -210,6 +210,7 @@ MODIFY User char(16) NOT NULL default '',
 MODIFY Grantor char(77) DEFAULT '' NOT NULL;
 Warnings:
 Warning	1265	Data truncated for column 'User' at row 1
+Warning	1265	Data truncated for column 'User' at row 2
 ALTER TABLE mysql.columns_priv
 MODIFY User char(16) NOT NULL default '';
 ALTER TABLE mysql.user

mysql-test/r/transactional_acl_tables.result

@@ -1347,6 +1347,7 @@ host	db	user	table_name	grantor	table_priv	column_priv
 h	test	u1	t1	root@localhost		Select,Insert,Update,References
 h	test	u1	t2	root@localhost		Insert
 localhost	PERCONA_SCHEMA	mysql.pxc.sst.role	xtrabackup_history	boot@	Select,Insert,Create,Alter	
+localhost	mysql	mysql.pxc.sst.role	plugin	boot@	Insert,Delete	
 localhost	mysql	mysql.session	user	root@localhost	Select	
 localhost	sys	mysql.sys	sys_config	root@localhost	Select	
 DELETE FROM mysql.columns_priv WHERE host = 'h' AND user = 'u1'
@@ -1358,6 +1359,7 @@ host	db	user	table_name	column_name	column_priv
 SELECT host, db, user, table_name, grantor, table_priv, column_priv FROM mysql.tables_priv;
 host	db	user	table_name	grantor	table_priv	column_priv
 localhost	PERCONA_SCHEMA	mysql.pxc.sst.role	xtrabackup_history	boot@	Select,Insert,Create,Alter	
+localhost	mysql	mysql.pxc.sst.role	plugin	boot@	Insert,Delete	
 localhost	mysql	mysql.session	user	root@localhost	Select	
 localhost	sys	mysql.sys	sys_config	root@localhost	Select	
 SHOW GRANTS FOR u1@h;

mysql-test/suite/funcs_1/r/is_schema_privileges.result

@@ -54,6 +54,8 @@ FROM information_schema.schema_privileges WHERE table_catalog IS NOT NULL;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE
 'mysql.sys'@'localhost'	def	sys	TRIGGER
 'mysql.pxc.sst.role'@'localhost'	def	performance_schema	SELECT
+'mysql.pxc.sst.role'@'localhost'	def	performance_schema	INSERT
+'mysql.pxc.sst.role'@'localhost'	def	performance_schema	UPDATE
 'mysql.session'@'localhost'	def	performance_schema	SELECT
 'mysql.pxc.sst.role'@'localhost'	def	PERCONA_SCHEMA	CREATE
 ''@'%'	def	test	SELECT

mysql-test/suite/funcs_1/r/is_table_privileges.result

@@ -59,6 +59,8 @@ def	PERCONA_SCHEMA	xtrabackup_history	ALTER
 def	PERCONA_SCHEMA	xtrabackup_history	CREATE
 def	PERCONA_SCHEMA	xtrabackup_history	INSERT
 def	PERCONA_SCHEMA	xtrabackup_history	SELECT
+def	mysql	plugin	DELETE
+def	mysql	plugin	INSERT
 def	mysql	user	SELECT
 def	sys	sys_config	SELECT
 ######################################################################

mysql-test/suite/galera/r/galera_defaults.result

@@ -49,7 +49,7 @@ WSREP_SLAVE_FK_CHECKS	ON
 WSREP_SLAVE_THREADS	1
 WSREP_SLAVE_UK_CHECKS	OFF
 WSREP_SR_STORE	table
-WSREP_SST_ALLOWED_METHODS	xtrabackup-v2
+WSREP_SST_ALLOWED_METHODS	xtrabackup-v2,clone
 WSREP_SST_DONOR	
 WSREP_SST_DONOR_REJECTS_QUERIES	OFF
 WSREP_SST_METHOD	xtrabackup-v2

mysql-test/suite/galera/r/galera_sst_allowed_methods.result

@@ -92,8 +92,8 @@ Restarting nodes to satisfy MTR's end-of-test checks
 # restart
 SHOW VARIABLES LIKE 'wsrep_sst_allowed_methods';
 Variable_name	Value
-wsrep_sst_allowed_methods	xtrabackup-v2
+wsrep_sst_allowed_methods	xtrabackup-v2,clone
 # restart
 SHOW VARIABLES LIKE 'wsrep_sst_allowed_methods';
 Variable_name	Value
-wsrep_sst_allowed_methods	xtrabackup-v2
+wsrep_sst_allowed_methods	xtrabackup-v2,clone