WL#15752: Add statement type "DDL" to transaction tracking facility - missing DDL statements

post-push fixes

Change-Id: I1d4135d18a6b06b6b76ce56bdabfb35ebc50dada

Author: Tatiana Azundris Nuernberg

mysql-test/suite/group_replication/r/gr_primary_manual_failover_vs_ddl_create_so_function.result

@@ -18,17 +18,13 @@ include/start_group_replication.inc
 ############################################################
 # 2. Start a DDL statement on server1, but do not let it complete yet.
 [connection server_1_1]
-SET DEBUG_SYNC= 'execute_command_before_main_switch SIGNAL ddl_running WAIT_FOR ddl_resume';
 # The statement to test with that should hold up switching the primary:
-CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
 [connection server1]
-SET DEBUG_SYNC= 'now WAIT_FOR ddl_running';
 
 ############################################################
 # 3. Set server2 as primary. The primary change must wait
 #    until the DDL statement has completed.
 [connection server_1]
-SELECT group_replication_set_as_primary("SERVER2_UUID");
 
 ############################################################
 # 4. Assert that server1 continues to be the primary, as the
@@ -41,9 +37,7 @@ include/assert.inc ['server1 continue to be primary']
 ############################################################
 # 5. Let the DDL statement finish.
 [connection server1]
-SET DEBUG_SYNC= 'now SIGNAL ddl_resume';
 [connection server_1_1]
-SET DEBUG_SYNC= 'RESET';
 
 ############################################################
 # 6. server2 should now be primary.
@@ -60,14 +54,13 @@ include/gr_assert_primary_member.inc
 [connection server2]
 include/show_relaylog_events.inc [FOR CHANNEL 'group_replication_applier']
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-server-relay-log-group_replication_applier.000002	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
-server-relay-log-group_replication_applier.000002	#	Query	#	#	use `test`; CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'
+server-relay-log-group_replication_applier.000002	#	Format_desc	#	#	#
+server-relay-log-group_replication_applier.000002	#	Query	#	#	#
 
 ############################################################
 # 8. Clean up.
 [connection server2]
 # The clean-up statement for our earlier test statement:
-DROP FUNCTION metaphon;
 include/rpl_sync.inc
 [connection server1]
 include/stop_group_replication.inc

mysql-test/suite/group_replication/r/gr_primary_manual_failover_vs_ddl_drop_so_function.result

@@ -13,24 +13,19 @@ Note	####	Storing MySQL user name or password information in the connection meta
 [connection server1]
 include/start_and_bootstrap_group_replication.inc
 # The set-up statement for our later test statement:
-CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
 [connection server2]
 include/start_group_replication.inc
 
 ############################################################
 # 2. Start a DDL statement on server1, but do not let it complete yet.
 [connection server_1_1]
-SET DEBUG_SYNC= 'execute_command_before_main_switch SIGNAL ddl_running WAIT_FOR ddl_resume';
 # The statement to test with that should hold up switching the primary:
-DROP FUNCTION metaphon;
 [connection server1]
-SET DEBUG_SYNC= 'now WAIT_FOR ddl_running';
 
 ############################################################
 # 3. Set server2 as primary. The primary change must wait
 #    until the DDL statement has completed.
 [connection server_1]
-SELECT group_replication_set_as_primary("SERVER2_UUID");
 
 ############################################################
 # 4. Assert that server1 continues to be the primary, as the
@@ -43,9 +38,7 @@ include/assert.inc ['server1 continue to be primary']
 ############################################################
 # 5. Let the DDL statement finish.
 [connection server1]
-SET DEBUG_SYNC= 'now SIGNAL ddl_resume';
 [connection server_1_1]
-SET DEBUG_SYNC= 'RESET';
 
 ############################################################
 # 6. server2 should now be primary.

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_dcl_grant.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/not_have_privilege_checks_user.inc
+
 --let $ddl_preparation_statement= CREATE USER wl15752
 --let $ddl_statement= GRANT SELECT, INSERT, UPDATE, DELETE ON test.* TO wl15752
 --let $ddl_cleanup_statement= DROP USER wl15752

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_dcl_revoke.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/not_have_privilege_checks_user.inc
+
 --let $ddl_preparation_statement= CREATE USER wl15752; GRANT SELECT, INSERT, UPDATE, DELETE ON test.* TO wl15752
 --let $ddl_statement= REVOKE ALL PRIVILEGES, GRANT OPTION FROM wl15752
 --let $ddl_cleanup_statement= DROP USER wl15752

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_alter_event.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 11 HOUR DO SELECT 1
 --let $ddl_statement= ALTER EVENT ev1 COMMENT "eventful"
 --let $ddl_cleanup_statement= DROP EVENT ev1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_alter_function.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE FUNCTION fun1 () RETURNS VARCHAR(64) RETURN "fun"
 --let $ddl_statement= ALTER FUNCTION fun1 COMMENT "it's fun"
 --let $ddl_cleanup_statement= DROP FUNCTION fun1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_alter_procedure.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE PROCEDURE proc1(export INT) BEGIN END
 --let $ddl_statement= ALTER PROCEDURE proc1 COMMENT 'it procs'
 --let $ddl_cleanup_statement= DROP PROCEDURE proc1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_alter_view.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE TABLE t1 (f1 INT, f2 INT); CREATE VIEW v1 AS SELECT f1 FROM t1
 --let $ddl_statement= ALTER VIEW v1 AS SELECT f2 FROM t1
 --let $ddl_cleanup_statement= DROP VIEW v1; DROP TABLE t1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_create_event.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement=
 --let $ddl_statement= CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 11 HOUR DO SELECT 1
 --let $ddl_cleanup_statement= DROP EVENT ev1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_create_function.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement=
 --let $ddl_statement= CREATE FUNCTION fun1 () RETURNS VARCHAR(64) RETURN "fun"
 --let $ddl_cleanup_statement= DROP FUNCTION fun1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_create_procedure.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement=
 --let $ddl_statement=  CREATE PROCEDURE proc1(export INT) BEGIN END
 --let $ddl_cleanup_statement= DROP PROCEDURE proc1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_create_so_function.test

@@ -10,7 +10,11 @@
 # the primary.                                              #
 #############################################################
 
+--let $show_binlog_events_mask_columns= 2, 4, 5, 6
+
 --let $ddl_preparation_statement=
 --let $ddl_statement= CREATE FUNCTION metaphon RETURNS STRING SONAME '$UDF_EXAMPLE_LIB'
 --let $ddl_cleanup_statement= DROP FUNCTION metaphon
+--disable_query_log
 --source ../include/gr_primary_manual_failover_vs_ddl.inc
+--enable_query_log

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_create_trigger.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE TABLE t1 (f1 INT)
 --let $ddl_statement= CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET @sum=@sum+NEW.f1
 --let $ddl_cleanup_statement= DROP TRIGGER tr1; DROP TABLE t1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_create_view.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE TABLE t1 (f1 INT)
 --let $ddl_statement= CREATE VIEW v1 AS SELECT f1 FROM t1
 --let $ddl_cleanup_statement= DROP VIEW v1; DROP TABLE t1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_drop_event.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 11 HOUR DO SELECT 1
 --let $ddl_statement= DROP EVENT ev1
 --let $ddl_cleanup_statement=

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_drop_function.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE FUNCTION fun1 () RETURNS VARCHAR(64) RETURN "fun"
 --let $ddl_statement= DROP FUNCTION fun1
 --let $ddl_cleanup_statement=

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_drop_procedure.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE PROCEDURE proc1(export INT) BEGIN END
 --let $ddl_statement= DROP PROCEDURE proc1
 --let $ddl_cleanup_statement=

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_drop_so_function.test

@@ -13,4 +13,6 @@
 --let $ddl_preparation_statement= CREATE FUNCTION metaphon RETURNS STRING SONAME '$UDF_EXAMPLE_LIB'
 --let $ddl_statement= DROP FUNCTION metaphon
 --let $ddl_cleanup_statement=
+--disable_query_log
 --source ../include/gr_primary_manual_failover_vs_ddl.inc
+--enable_query_log

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_drop_trigger.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE TABLE t1 (f1 INT); CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET @sum=@sum+NEW.f1
 --let $ddl_statement= DROP TRIGGER tr1
 --let $ddl_cleanup_statement= DROP TABLE t1

mysql-test/suite/group_replication/t/gr_primary_manual_failover_vs_ddl_drop_view.test

@@ -10,6 +10,8 @@
 # the primary.                                              #
 #############################################################
 
+--source include/set_privilege_checks_user_as_system_user.inc
+
 --let $ddl_preparation_statement= CREATE TABLE t1 (f1 INT, f2 INT); CREATE VIEW v1 AS SELECT f1 FROM t1
 --let $ddl_statement= DROP VIEW v1
 --let $ddl_cleanup_statement= DROP TABLE t1