diff options
Diffstat (limited to 'mysql-test')
29 files changed, 1839 insertions, 297 deletions
diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test index da0b570ae35..9bba18b170b 100644 --- a/mysql-test/include/check-testcase.test +++ b/mysql-test/include/check-testcase.test @@ -66,6 +66,7 @@ if ($tmp) --echo Gtid_IO_Pos # --echo Replicate_Do_Domain_Ids --echo Replicate_Ignore_Domain_Ids + --echo Parallel_Mode domain,follow_master_commit } if (!$tmp) { # Note: after WL#5177, fields 13-18 shall not be filtered-out. diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index e37d86d9567..c5442c3a264 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -920,6 +920,17 @@ The following options may be given as the first argument: parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0. + --slave-parallel-mode=name + Controls what transactions are applied in parallel when + using --slave-parallel-threads. Syntax: + slave_parallel_mode=value[,value...], where "value" could + be one or more of: "domain", to apply different + replication domains in parallel; "follow_master_commit", + to apply in parallel transactions that group-committed + together on the master; "transactional", to + optimistically try to apply all transactional DML in + parallel; and "waiting" to extend "transactional" to even + transactions that had to wait on the master. --slave-parallel-threads=# If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on @@ -1341,6 +1352,7 @@ slave-exec-mode STRICT slave-max-allowed-packet 1073741824 slave-net-timeout 3600 slave-parallel-max-queued 131072 +slave-parallel-mode domain,follow_master_commit slave-parallel-threads 0 slave-run-triggers-for-rbr NO slave-skip-errors (No default value) diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result index f14763ca64b..40ebbbcd993 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result @@ -340,7 +340,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -393,7 +394,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 ddl /*!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -401,7 +402,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5 ddl /*!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -581,7 +582,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-16 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-16 ddl /*!100001 SET @@session.gtid_seq_no=16*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -589,7 +590,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-17 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-17 ddl /*!100001 SET @@session.gtid_seq_no=17*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -615,7 +616,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-19 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-19 ddl /*!100001 SET @@session.gtid_seq_no=19*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -623,7 +624,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-20 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-20 ddl /*!100001 SET @@session.gtid_seq_no=20*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -699,7 +700,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-25 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-25 ddl /*!100001 SET @@session.gtid_seq_no=25*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -707,7 +708,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-26 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-26 ddl /*!100001 SET @@session.gtid_seq_no=26*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -791,7 +792,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-31 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-31 ddl /*!100001 SET @@session.gtid_seq_no=31*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -799,7 +800,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-32 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-32 ddl /*!100001 SET @@session.gtid_seq_no=32*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -844,7 +845,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-35 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-35 ddl /*!100001 SET @@session.gtid_seq_no=35*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -852,7 +853,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-36 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-36 ddl /*!100001 SET @@session.gtid_seq_no=36*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -894,7 +895,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-39 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-39 ddl /*!100001 SET @@session.gtid_seq_no=39*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -902,7 +903,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-40 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-40 ddl /*!100001 SET @@session.gtid_seq_no=40*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -944,7 +945,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-43 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-43 ddl /*!100001 SET @@session.gtid_seq_no=43*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -952,7 +953,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-44 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-44 ddl /*!100001 SET @@session.gtid_seq_no=44*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1016,7 +1017,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-48 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-48 ddl /*!100001 SET @@session.gtid_seq_no=48*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1024,7 +1025,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-49 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-49 ddl /*!100001 SET @@session.gtid_seq_no=49*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1066,7 +1067,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-52 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-52 ddl /*!100001 SET @@session.gtid_seq_no=52*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1074,7 +1075,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-53 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-53 ddl /*!100001 SET @@session.gtid_seq_no=53*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1138,7 +1139,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-57 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-57 ddl /*!100001 SET @@session.gtid_seq_no=57*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1146,7 +1147,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-58 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-58 ddl /*!100001 SET @@session.gtid_seq_no=58*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1188,7 +1189,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-61 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-61 ddl /*!100001 SET @@session.gtid_seq_no=61*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1196,7 +1197,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-62 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-62 ddl /*!100001 SET @@session.gtid_seq_no=62*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1260,7 +1261,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-66 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-66 ddl /*!100001 SET @@session.gtid_seq_no=66*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1268,7 +1269,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-67 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-67 ddl /*!100001 SET @@session.gtid_seq_no=67*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1310,7 +1311,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-70 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-70 ddl /*!100001 SET @@session.gtid_seq_no=70*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1318,7 +1319,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-71 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-71 ddl /*!100001 SET @@session.gtid_seq_no=71*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1382,7 +1383,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-75 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-75 ddl /*!100001 SET @@session.gtid_seq_no=75*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1390,7 +1391,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-76 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-76 ddl /*!100001 SET @@session.gtid_seq_no=76*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1432,7 +1433,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-79 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-79 ddl /*!100001 SET @@session.gtid_seq_no=79*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1440,7 +1441,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-80 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-80 ddl /*!100001 SET @@session.gtid_seq_no=80*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1482,7 +1483,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-83 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-83 ddl /*!100001 SET @@session.gtid_seq_no=83*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1490,7 +1491,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-84 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-84 ddl /*!100001 SET @@session.gtid_seq_no=84*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1549,7 +1550,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-88 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-88 ddl /*!100001 SET @@session.gtid_seq_no=88*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1557,7 +1558,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-89 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-89 ddl /*!100001 SET @@session.gtid_seq_no=89*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1599,7 +1600,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-92 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-92 ddl /*!100001 SET @@session.gtid_seq_no=92*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1607,7 +1608,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-93 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-93 ddl /*!100001 SET @@session.gtid_seq_no=93*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1649,7 +1650,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-96 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-96 ddl /*!100001 SET @@session.gtid_seq_no=96*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1657,7 +1658,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-97 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-97 ddl /*!100001 SET @@session.gtid_seq_no=97*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1700,7 +1701,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-100 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-100 ddl /*!100001 SET @@session.gtid_seq_no=100*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1708,7 +1709,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-101 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-101 ddl /*!100001 SET @@session.gtid_seq_no=101*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1750,7 +1751,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-104 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-104 ddl /*!100001 SET @@session.gtid_seq_no=104*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1758,7 +1759,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-105 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-105 ddl /*!100001 SET @@session.gtid_seq_no=105*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1800,7 +1801,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-108 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-108 ddl /*!100001 SET @@session.gtid_seq_no=108*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1808,7 +1809,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-109 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-109 ddl /*!100001 SET @@session.gtid_seq_no=109*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1850,7 +1851,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-112 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-112 ddl /*!100001 SET @@session.gtid_seq_no=112*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1858,7 +1859,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-113 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-113 ddl /*!100001 SET @@session.gtid_seq_no=113*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1900,7 +1901,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-116 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-116 ddl /*!100001 SET @@session.gtid_seq_no=116*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1908,7 +1909,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-117 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-117 ddl /*!100001 SET @@session.gtid_seq_no=117*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1950,7 +1951,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-120 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-120 ddl /*!100001 SET @@session.gtid_seq_no=120*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1958,7 +1959,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-121 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-121 ddl /*!100001 SET @@session.gtid_seq_no=121*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2000,7 +2001,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-124 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-124 ddl /*!100001 SET @@session.gtid_seq_no=124*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2008,7 +2009,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-125 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-125 ddl /*!100001 SET @@session.gtid_seq_no=125*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2050,7 +2051,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-128 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-128 ddl /*!100001 SET @@session.gtid_seq_no=128*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2058,7 +2059,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-129 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-129 ddl /*!100001 SET @@session.gtid_seq_no=129*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2100,7 +2101,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-132 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-132 ddl /*!100001 SET @@session.gtid_seq_no=132*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2108,7 +2109,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-133 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-133 ddl /*!100001 SET @@session.gtid_seq_no=133*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2150,7 +2151,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-136 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-136 ddl /*!100001 SET @@session.gtid_seq_no=136*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2158,7 +2159,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-137 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-137 ddl /*!100001 SET @@session.gtid_seq_no=137*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2220,7 +2221,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-141 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-141 ddl /*!100001 SET @@session.gtid_seq_no=141*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2228,7 +2229,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-142 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-142 ddl /*!100001 SET @@session.gtid_seq_no=142*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2270,7 +2271,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-145 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-145 ddl /*!100001 SET @@session.gtid_seq_no=145*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2278,7 +2279,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-146 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-146 ddl /*!100001 SET @@session.gtid_seq_no=146*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2320,7 +2321,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-149 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-149 ddl /*!100001 SET @@session.gtid_seq_no=149*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2328,7 +2329,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-150 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-150 ddl /*!100001 SET @@session.gtid_seq_no=150*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2370,7 +2371,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-153 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-153 ddl /*!100001 SET @@session.gtid_seq_no=153*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2378,7 +2379,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-154 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-154 ddl /*!100001 SET @@session.gtid_seq_no=154*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2442,7 +2443,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-158 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-158 ddl /*!100001 SET @@session.gtid_seq_no=158*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2450,7 +2451,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-159 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-159 ddl /*!100001 SET @@session.gtid_seq_no=159*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2492,7 +2493,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-162 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-162 ddl /*!100001 SET @@session.gtid_seq_no=162*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2500,7 +2501,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-163 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-163 ddl /*!100001 SET @@session.gtid_seq_no=163*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2542,7 +2543,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-166 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-166 ddl /*!100001 SET @@session.gtid_seq_no=166*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2550,7 +2551,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-167 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-167 ddl /*!100001 SET @@session.gtid_seq_no=167*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2592,7 +2593,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-170 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-170 ddl /*!100001 SET @@session.gtid_seq_no=170*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2600,7 +2601,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-171 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-171 ddl /*!100001 SET @@session.gtid_seq_no=171*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2642,7 +2643,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-174 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-174 ddl /*!100001 SET @@session.gtid_seq_no=174*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2650,7 +2651,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-175 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-175 ddl /*!100001 SET @@session.gtid_seq_no=175*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2692,7 +2693,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-178 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-178 ddl /*!100001 SET @@session.gtid_seq_no=178*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2700,7 +2701,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-179 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-179 ddl /*!100001 SET @@session.gtid_seq_no=179*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2742,7 +2743,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-182 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-182 ddl /*!100001 SET @@session.gtid_seq_no=182*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2750,7 +2751,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-183 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-183 ddl /*!100001 SET @@session.gtid_seq_no=183*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2812,7 +2813,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-187 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-187 ddl /*!100001 SET @@session.gtid_seq_no=187*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2820,7 +2821,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-188 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-188 ddl /*!100001 SET @@session.gtid_seq_no=188*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2882,7 +2883,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-192 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-192 ddl /*!100001 SET @@session.gtid_seq_no=192*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2890,7 +2891,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-193 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-193 ddl /*!100001 SET @@session.gtid_seq_no=193*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2932,7 +2933,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-196 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-196 ddl /*!100001 SET @@session.gtid_seq_no=196*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2940,7 +2941,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-197 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-197 ddl /*!100001 SET @@session.gtid_seq_no=197*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2982,7 +2983,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-200 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-200 ddl /*!100001 SET @@session.gtid_seq_no=200*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -2990,7 +2991,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-201 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-201 ddl /*!100001 SET @@session.gtid_seq_no=201*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3032,7 +3033,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-204 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-204 ddl /*!100001 SET @@session.gtid_seq_no=204*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3040,7 +3041,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-205 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-205 ddl /*!100001 SET @@session.gtid_seq_no=205*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3082,7 +3083,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-208 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-208 ddl /*!100001 SET @@session.gtid_seq_no=208*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3090,7 +3091,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-209 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-209 ddl /*!100001 SET @@session.gtid_seq_no=209*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3166,7 +3167,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-214 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-214 ddl /*!100001 SET @@session.gtid_seq_no=214*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3174,7 +3175,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-215 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-215 ddl /*!100001 SET @@session.gtid_seq_no=215*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3216,7 +3217,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-218 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-218 ddl /*!100001 SET @@session.gtid_seq_no=218*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3224,7 +3225,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-219 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-219 ddl /*!100001 SET @@session.gtid_seq_no=219*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3300,7 +3301,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-224 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-224 ddl /*!100001 SET @@session.gtid_seq_no=224*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3308,7 +3309,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-225 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-225 ddl /*!100001 SET @@session.gtid_seq_no=225*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3384,7 +3385,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-230 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-230 ddl /*!100001 SET @@session.gtid_seq_no=230*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3392,7 +3393,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-231 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-231 ddl /*!100001 SET @@session.gtid_seq_no=231*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3434,7 +3435,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-234 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-234 ddl /*!100001 SET @@session.gtid_seq_no=234*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3442,7 +3443,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-235 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-235 ddl /*!100001 SET @@session.gtid_seq_no=235*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3518,7 +3519,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-240 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-240 ddl /*!100001 SET @@session.gtid_seq_no=240*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3526,7 +3527,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-241 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-241 ddl /*!100001 SET @@session.gtid_seq_no=241*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3602,7 +3603,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-246 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-246 ddl /*!100001 SET @@session.gtid_seq_no=246*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3610,7 +3611,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-247 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-247 ddl /*!100001 SET @@session.gtid_seq_no=247*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3652,7 +3653,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-250 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-250 ddl /*!100001 SET @@session.gtid_seq_no=250*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3660,7 +3661,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-251 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-251 ddl /*!100001 SET @@session.gtid_seq_no=251*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3702,7 +3703,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-254 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-254 ddl /*!100001 SET @@session.gtid_seq_no=254*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3710,7 +3711,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-255 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-255 ddl /*!100001 SET @@session.gtid_seq_no=255*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3752,7 +3753,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-258 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-258 ddl /*!100001 SET @@session.gtid_seq_no=258*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3760,7 +3761,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-259 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-259 ddl /*!100001 SET @@session.gtid_seq_no=259*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3802,7 +3803,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-262 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-262 ddl /*!100001 SET @@session.gtid_seq_no=262*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3810,7 +3811,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-263 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-263 ddl /*!100001 SET @@session.gtid_seq_no=263*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3852,7 +3853,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-266 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-266 ddl /*!100001 SET @@session.gtid_seq_no=266*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3860,7 +3861,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-267 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-267 ddl /*!100001 SET @@session.gtid_seq_no=267*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3902,7 +3903,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-270 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-270 ddl /*!100001 SET @@session.gtid_seq_no=270*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3910,7 +3911,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-271 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-271 ddl /*!100001 SET @@session.gtid_seq_no=271*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3952,7 +3953,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-274 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-274 ddl /*!100001 SET @@session.gtid_seq_no=274*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -3960,7 +3961,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-275 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-275 ddl /*!100001 SET @@session.gtid_seq_no=275*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4002,7 +4003,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-278 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-278 ddl /*!100001 SET @@session.gtid_seq_no=278*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4010,7 +4011,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-279 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-279 ddl /*!100001 SET @@session.gtid_seq_no=279*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4052,7 +4053,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-282 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-282 ddl /*!100001 SET @@session.gtid_seq_no=282*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4060,7 +4061,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-283 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-283 ddl /*!100001 SET @@session.gtid_seq_no=283*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4102,7 +4103,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-286 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-286 ddl /*!100001 SET @@session.gtid_seq_no=286*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4110,7 +4111,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-287 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-287 ddl /*!100001 SET @@session.gtid_seq_no=287*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4152,7 +4153,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-290 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-290 ddl /*!100001 SET @@session.gtid_seq_no=290*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4160,7 +4161,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-291 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-291 ddl /*!100001 SET @@session.gtid_seq_no=291*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4202,7 +4203,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-294 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-294 ddl /*!100001 SET @@session.gtid_seq_no=294*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4210,7 +4211,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-295 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-295 ddl /*!100001 SET @@session.gtid_seq_no=295*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4252,7 +4253,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-298 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-298 ddl /*!100001 SET @@session.gtid_seq_no=298*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4260,7 +4261,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-299 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-299 ddl /*!100001 SET @@session.gtid_seq_no=299*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4404,7 +4405,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-308 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-308 ddl /*!100001 SET @@session.gtid_seq_no=308*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4412,7 +4413,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP TABLE `t1` /* generated by server */ /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-309 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-309 ddl /*!100001 SET @@session.gtid_seq_no=309*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4420,7 +4421,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE TABLE t1 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0) /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-310 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-310 ddl /*!100001 SET @@session.gtid_seq_no=310*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4546,7 +4547,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-316 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-316 ddl /*!100001 SET @@session.gtid_seq_no=316*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result index ec6b2c85912..2522e1ae568 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result @@ -2257,7 +2257,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -2364,7 +2365,7 @@ crn INT -- row number ) ENGINE=InnoDB DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 trans /*!100001 SET @@session.gtid_seq_no=2*//*!*/; BEGIN /*!*/; @@ -2457,7 +2458,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 trans /*!100001 SET @@session.gtid_seq_no=3*//*!*/; BEGIN /*!*/; @@ -2550,7 +2551,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 trans /*!100001 SET @@session.gtid_seq_no=4*//*!*/; BEGIN /*!*/; @@ -2726,7 +2727,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5 trans /*!100001 SET @@session.gtid_seq_no=5*//*!*/; BEGIN /*!*/; @@ -2899,7 +2900,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-6 trans /*!100001 SET @@session.gtid_seq_no=6*//*!*/; BEGIN /*!*/; @@ -3072,7 +3073,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-7 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-7 trans /*!100001 SET @@session.gtid_seq_no=7*//*!*/; BEGIN /*!*/; @@ -3245,7 +3246,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-8 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-8 trans /*!100001 SET @@session.gtid_seq_no=8*//*!*/; BEGIN /*!*/; @@ -3418,7 +3419,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-9 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-9 trans /*!100001 SET @@session.gtid_seq_no=9*//*!*/; BEGIN /*!*/; @@ -3511,7 +3512,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-10 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-10 trans /*!100001 SET @@session.gtid_seq_no=10*//*!*/; BEGIN /*!*/; @@ -3604,7 +3605,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-11 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-11 trans /*!100001 SET @@session.gtid_seq_no=11*//*!*/; BEGIN /*!*/; @@ -3697,7 +3698,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-12 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-12 trans /*!100001 SET @@session.gtid_seq_no=12*//*!*/; BEGIN /*!*/; @@ -3890,7 +3891,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -3913,7 +3915,7 @@ crn INT -- row number ) ENGINE=InnoDB DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 trans /*!100001 SET @@session.gtid_seq_no=2*//*!*/; BEGIN /*!*/; @@ -3970,7 +3972,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 trans /*!100001 SET @@session.gtid_seq_no=3*//*!*/; BEGIN /*!*/; @@ -4045,7 +4047,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 trans /*!100001 SET @@session.gtid_seq_no=4*//*!*/; BEGIN /*!*/; @@ -4268,7 +4270,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -4291,7 +4294,7 @@ c_1_n INT -- row number ) ENGINE=InnoDB DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4303,7 +4306,7 @@ c_2_n INT -- row number ) ENGINE=InnoDB DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4315,7 +4318,7 @@ c_3_n INT -- row number ) ENGINE=InnoDB DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 trans /*!100001 SET @@session.gtid_seq_no=4*//*!*/; BEGIN /*!*/; @@ -4372,7 +4375,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5 trans /*!100001 SET @@session.gtid_seq_no=5*//*!*/; BEGIN /*!*/; @@ -4429,7 +4432,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-6 trans /*!100001 SET @@session.gtid_seq_no=6*//*!*/; BEGIN /*!*/; @@ -4486,7 +4489,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-7 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-7 trans /*!100001 SET @@session.gtid_seq_no=7*//*!*/; BEGIN /*!*/; @@ -4668,7 +4671,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-8 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-8 trans /*!100001 SET @@session.gtid_seq_no=8*//*!*/; BEGIN /*!*/; @@ -4846,7 +4849,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -4869,7 +4873,7 @@ c3 VARCHAR(60) ) ENGINE=InnoDB DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 trans /*!100001 SET @@session.gtid_seq_no=2*//*!*/; BEGIN /*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result index 16cec8180c4..d14251dc2e6 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result @@ -2257,7 +2257,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -3913,7 +3914,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -4297,7 +4299,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -4320,7 +4323,7 @@ c_1_n INT -- row number ) ENGINE=MyISAM DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4332,7 +4335,7 @@ c_2_n INT -- row number ) ENGINE=MyISAM DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -4885,7 +4888,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result index 7feb5313246..82759613476 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result @@ -136,7 +136,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -158,7 +159,7 @@ c2 VARCHAR(20) ) ENGINE=InnoDB DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -169,7 +170,7 @@ c2 VARCHAR(20) ) ENGINE=MyISAM DEFAULT CHARSET latin1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-3 trans /*!100001 SET @@session.gtid_seq_no=3*//*!*/; BEGIN /*!*/; @@ -226,7 +227,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-4 ddl /*!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -234,7 +235,7 @@ SET TIMESTAMP=1000000000/*!*/; TRUNCATE TABLE t1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-5 ddl /*!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -321,7 +322,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-9 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-9 trans /*!100001 SET @@session.gtid_seq_no=9*//*!*/; BEGIN /*!*/; @@ -378,7 +379,7 @@ BEGIN #010909 4:46:40 server id 1 end_log_pos # Xid = # COMMIT/*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-10 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-10 ddl /*!100001 SET @@session.gtid_seq_no=10*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -386,7 +387,7 @@ SET TIMESTAMP=1000000000/*!*/; TRUNCATE TABLE t1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-11 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-11 ddl /*!100001 SET @@session.gtid_seq_no=11*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -473,7 +474,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-15 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-15 ddl /*!100001 SET @@session.gtid_seq_no=15*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -481,7 +482,7 @@ SET TIMESTAMP=1000000000/*!*/; TRUNCATE TABLE t1 /*!*/; # at # -#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-16 +#010909 4:46:40 server id 1 end_log_pos # GTID 0-1-16 ddl /*!100001 SET @@session.gtid_seq_no=16*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0 diff --git a/mysql-test/suite/binlog/r/binlog_row_annotate.result b/mysql-test/suite/binlog/r/binlog_row_annotate.result index c59344b729e..4fcbc260632 100644 --- a/mysql-test/suite/binlog/r/binlog_row_annotate.result +++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result @@ -80,7 +80,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -98,7 +99,7 @@ SET @@session.collation_database=DEFAULT/*!*/; DROP DATABASE IF EXISTS test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -106,7 +107,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP DATABASE IF EXISTS test2 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -114,7 +115,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP DATABASE IF EXISTS test3 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 ddl /*!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -122,7 +123,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 ddl /*!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -130,7 +131,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test2 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 ddl /*!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -332,7 +333,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -350,15 +352,15 @@ SET @@session.collation_database=DEFAULT/*!*/; DROP DATABASE IF EXISTS test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 ddl /*!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -366,11 +368,11 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 ddl /*!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 ddl /*!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # # at # @@ -503,7 +505,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -521,7 +524,7 @@ SET @@session.collation_database=DEFAULT/*!*/; DROP DATABASE IF EXISTS test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -529,7 +532,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP DATABASE IF EXISTS test2 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -537,7 +540,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP DATABASE IF EXISTS test3 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 ddl /*!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -545,7 +548,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 ddl /*!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -553,7 +556,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test2 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 ddl /*!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -745,7 +748,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -763,7 +767,7 @@ SET @@session.collation_database=DEFAULT/*!*/; DROP DATABASE IF EXISTS test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -771,7 +775,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP DATABASE IF EXISTS test2 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -779,7 +783,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP DATABASE IF EXISTS test3 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 ddl /*!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -787,7 +791,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 ddl /*!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -795,7 +799,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test2 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 ddl /*!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -997,7 +1001,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -1015,15 +1020,15 @@ SET @@session.collation_database=DEFAULT/*!*/; DROP DATABASE IF EXISTS test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 ddl /*!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1031,11 +1036,11 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 ddl /*!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 ddl /*!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # # at # @@ -1168,7 +1173,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -1186,7 +1192,7 @@ SET @@session.collation_database=DEFAULT/*!*/; DROP DATABASE IF EXISTS test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl /*!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1194,7 +1200,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP DATABASE IF EXISTS test2 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1202,7 +1208,7 @@ SET TIMESTAMP=1000000000/*!*/; DROP DATABASE IF EXISTS test3 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-4 ddl /*!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1210,7 +1216,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test1 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-5 ddl /*!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -1218,7 +1224,7 @@ SET TIMESTAMP=1000000000/*!*/; CREATE DATABASE test2 /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 ddl /*!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 diff --git a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result index 926e962731f..24471795499 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result +++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result @@ -40,7 +40,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -81,7 +82,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -128,7 +129,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 ddl /*!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # use `new_test3`/*!*/; @@ -251,7 +252,8 @@ ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl +/*!100101 SET @@session.replicate_allow_parallel=1*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/; @@ -292,7 +294,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl /*!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 @@ -339,7 +341,7 @@ SET TIMESTAMP=1000000000/*!*/; COMMIT /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 +#010909 4:46:40 server id # end_log_pos # GTID 0-1-6 ddl /*!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # use `new_test3`/*!*/; diff --git a/mysql-test/suite/multi_source/info_logs.result b/mysql-test/suite/multi_source/info_logs.result index 2730a5531f5..adab98d0e0c 100644 --- a/mysql-test/suite/multi_source/info_logs.result +++ b/mysql-test/suite/multi_source/info_logs.result @@ -84,17 +84,17 @@ MASTER 2.2 # EOF # show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos - Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 relay.000002 601 master-bin.000001 Yes Yes 0 0 313 888 None 0 No 0 No 0 0 1 No 0 1073741824 7 0 60.000 -MASTER 2.2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 relay-master@00202@002e2.000002 601 master-bin.000001 Yes Yes 0 0 313 907 None 0 No 0 No 0 0 2 No 0 1073741824 7 0 60.000 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos + Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 relay.000002 601 master-bin.000001 Yes Yes 0 0 313 888 None 0 No 0 No 0 0 1 No domain,follow_master_commit 0 1073741824 7 0 60.000 +MASTER 2.2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 relay-master@00202@002e2.000002 601 master-bin.000001 Yes Yes 0 0 313 907 None 0 No 0 No 0 0 2 No domain,follow_master_commit 0 1073741824 7 0 60.000 include/wait_for_slave_to_start.inc set default_master_connection = 'MASTER 2.2'; include/wait_for_slave_to_start.inc set default_master_connection = ''; show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos - Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 relay.000004 536 master-bin.000001 Yes Yes 0 0 313 823 None 0 No 0 No 0 0 1 No 0 1073741824 6 0 60.000 -MASTER 2.2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 relay-master@00202@002e2.000004 536 master-bin.000001 Yes Yes 0 0 313 842 None 0 No 0 No 0 0 2 No 0 1073741824 6 0 60.000 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos + Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 relay.000004 536 master-bin.000001 Yes Yes 0 0 313 823 None 0 No 0 No 0 0 1 No domain,follow_master_commit 0 1073741824 6 0 60.000 +MASTER 2.2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 relay-master@00202@002e2.000004 536 master-bin.000001 Yes Yes 0 0 313 842 None 0 No 0 No 0 0 2 No domain,follow_master_commit 0 1073741824 6 0 60.000 # # List of files matching '*info*' pattern # after slave server restart diff --git a/mysql-test/suite/multi_source/multisource.result b/mysql-test/suite/multi_source/multisource.result index 308ccec9dd8..1647da74218 100644 --- a/mysql-test/suite/multi_source/multisource.result +++ b/mysql-test/suite/multi_source/multisource.result @@ -10,14 +10,14 @@ start slave 'master1'; set default_master_connection = 'master1'; include/wait_for_slave_to_start.inc show slave 'master1' status; -Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids -Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 mysqld-relay-bin-master1.000002 601 master-bin.000001 Yes Yes 0 0 313 907 None 0 No 0 No 0 0 1 No +Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode +Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 mysqld-relay-bin-master1.000002 601 master-bin.000001 Yes Yes 0 0 313 907 None 0 No 0 No 0 0 1 No domain,follow_master_commit show slave status; -Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids -Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 mysqld-relay-bin-master1.000002 601 master-bin.000001 Yes Yes 0 0 313 907 None 0 No 0 No 0 0 1 No +Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode +Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 mysqld-relay-bin-master1.000002 601 master-bin.000001 Yes Yes 0 0 313 907 None 0 No 0 No 0 0 1 No domain,follow_master_commit show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos -master1 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 mysqld-relay-bin-master1.000002 601 master-bin.000001 Yes Yes 0 0 313 907 None 0 No 0 No 0 0 1 No 0 1073741824 7 0 60.000 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos +master1 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 mysqld-relay-bin-master1.000002 601 master-bin.000001 Yes Yes 0 0 313 907 None 0 No 0 No 0 0 1 No domain,follow_master_commit 0 1073741824 7 0 60.000 drop database if exists db1; create database db1; use db1; @@ -75,9 +75,9 @@ master_user='root'; start slave; include/wait_for_slave_to_start.inc show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos - Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin.000002 601 master-bin.000001 Yes Yes 0 0 313 899 None 0 No 0 No 0 0 2 No 0 1073741824 7 0 60.000 0-1-4 -master1 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 988 mysqld-relay-bin-master1.000002 1276 master-bin.000001 Yes Yes 0 0 988 1582 None 0 No 0 No 0 0 1 No 0 1073741824 17 0 60.000 0-1-4 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos + Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin.000002 601 master-bin.000001 Yes Yes 0 0 313 899 None 0 No 0 No 0 0 2 No domain,follow_master_commit 0 1073741824 7 0 60.000 0-1-4 +master1 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 988 mysqld-relay-bin-master1.000002 1276 master-bin.000001 Yes Yes 0 0 988 1582 None 0 No 0 No 0 0 1 No domain,follow_master_commit 0 1073741824 17 0 60.000 0-1-4 insert into t1 (f1) values ('three'); drop database if exists db2; create database db2; @@ -105,9 +105,9 @@ master-bin.000002 367 insert into t1 (f1) values ('four'); create table db1.t3 (f1 int) engine=InnoDB; show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos - Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 921 mysqld-relay-bin.000002 1209 master-bin.000001 Yes Yes 0 0 921 1507 None 0 No 0 No 0 0 2 No 0 1073741824 17 0 60.000 0-1-7 -master1 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000002 740 mysqld-relay-bin-master1.000004 1028 master-bin.000002 Yes Yes 0 0 740 1378 None 0 No 0 No 0 0 1 No 0 1073741824 37 0 60.000 0-1-7 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos + Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 921 mysqld-relay-bin.000002 1209 master-bin.000001 Yes Yes 0 0 921 1507 None 0 No 0 No 0 0 2 No domain,follow_master_commit 0 1073741824 17 0 60.000 0-1-7 +master1 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000002 740 mysqld-relay-bin-master1.000004 1028 master-bin.000002 Yes Yes 0 0 740 1378 None 0 No 0 No 0 0 1 No domain,follow_master_commit 0 1073741824 37 0 60.000 0-1-7 select * from db1.t1; i f1 1 one diff --git a/mysql-test/suite/multi_source/reset_slave.result b/mysql-test/suite/multi_source/reset_slave.result index d5fd405b050..c968d705a81 100644 --- a/mysql-test/suite/multi_source/reset_slave.result +++ b/mysql-test/suite/multi_source/reset_slave.result @@ -10,15 +10,15 @@ create table t1 (i int) engine=MyISAM; insert into t1 values (1),(2); stop slave 'master1'; show slave 'master1' status; -Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids - 127.0.0.1 root MYPORT_1 60 master-bin.000001 802 mysqld-relay-bin-master1.000002 1090 master-bin.000001 No No 0 0 802 1396 None 0 No NULL No 0 0 1 No +Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode + 127.0.0.1 root MYPORT_1 60 master-bin.000001 802 mysqld-relay-bin-master1.000002 1090 master-bin.000001 No No 0 0 802 1396 None 0 No NULL No 0 0 1 No domain,follow_master_commit mysqld-relay-bin-master1.000001 mysqld-relay-bin-master1.000002 mysqld-relay-bin-master1.index reset slave 'master1'; show slave 'master1' status; -Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids - 127.0.0.1 root MYPORT_1 60 4 1090 No No 0 0 0 1396 None 0 No NULL No 0 0 1 No +Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode + 127.0.0.1 root MYPORT_1 60 4 1090 No No 0 0 0 1396 None 0 No NULL No 0 0 1 No domain,follow_master_commit reset slave 'master1' all; show slave 'master1' status; ERROR HY000: There is no master connection 'master1' diff --git a/mysql-test/suite/multi_source/simple.result b/mysql-test/suite/multi_source/simple.result index 2b4590ae095..6c6e15bb750 100644 --- a/mysql-test/suite/multi_source/simple.result +++ b/mysql-test/suite/multi_source/simple.result @@ -10,9 +10,9 @@ Note 1937 SLAVE 'slave2' started include/wait_for_slave_to_start.inc set default_master_connection = ''; show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos -slave1 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 mysqld-relay-bin-slave1.000002 601 master-bin.000001 Yes Yes 0 0 313 906 None 0 No 0 No 0 0 1 No 0 1073741824 7 0 60.000 -slave2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin-slave2.000002 601 master-bin.000001 Yes Yes 0 0 313 906 None 0 No 0 No 0 0 2 No 0 1073741824 7 0 60.000 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos +slave1 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_1 60 master-bin.000001 313 mysqld-relay-bin-slave1.000002 601 master-bin.000001 Yes Yes 0 0 313 906 None 0 No 0 No 0 0 1 No domain,follow_master_commit 0 1073741824 7 0 60.000 +slave2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin-slave2.000002 601 master-bin.000001 Yes Yes 0 0 313 906 None 0 No 0 No 0 0 2 No domain,follow_master_commit 0 1073741824 7 0 60.000 start all slaves; stop slave 'slave1'; show slave 'slave1' status; @@ -62,21 +62,22 @@ Using_Gtid No Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids +Parallel_Mode domain,follow_master_commit reset slave 'slave1'; show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos -slave1 127.0.0.1 root MYPORT_1 60 4 601 No No 0 0 0 906 None 0 No NULL No 0 0 1 No 0 1073741824 7 0 60.000 -slave2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin-slave2.000002 601 master-bin.000001 Yes Yes 0 0 313 906 None 0 No 0 No 0 0 2 No 0 1073741824 7 0 60.000 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos +slave1 127.0.0.1 root MYPORT_1 60 4 601 No No 0 0 0 906 None 0 No NULL No 0 0 1 No domain,follow_master_commit 0 1073741824 7 0 60.000 +slave2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin-slave2.000002 601 master-bin.000001 Yes Yes 0 0 313 906 None 0 No 0 No 0 0 2 No domain,follow_master_commit 0 1073741824 7 0 60.000 reset slave 'slave1' all; show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos -slave2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin-slave2.000002 601 master-bin.000001 Yes Yes 0 0 313 906 None 0 No 0 No 0 0 2 No 0 1073741824 7 0 60.000 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos +slave2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin-slave2.000002 601 master-bin.000001 Yes Yes 0 0 313 906 None 0 No 0 No 0 0 2 No domain,follow_master_commit 0 1073741824 7 0 60.000 stop all slaves; Warnings: Note 1938 SLAVE 'slave2' stopped show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos -slave2 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin-slave2.000002 601 master-bin.000001 No No 0 0 313 906 None 0 No NULL No 0 0 2 No 0 1073741824 7 0 60.000 +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos +slave2 127.0.0.1 root MYPORT_2 60 master-bin.000001 313 mysqld-relay-bin-slave2.000002 601 master-bin.000001 No No 0 0 313 906 None 0 No NULL No 0 0 2 No domain,follow_master_commit 0 1073741824 7 0 60.000 stop all slaves; include/reset_master_slave.inc include/reset_master_slave.inc diff --git a/mysql-test/suite/multi_source/syntax.result b/mysql-test/suite/multi_source/syntax.result index 166dd09c1a3..55b124bf5a1 100644 --- a/mysql-test/suite/multi_source/syntax.result +++ b/mysql-test/suite/multi_source/syntax.result @@ -1,11 +1,11 @@ include/master-slave.inc [connection master] show slave status; -Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids +Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode show slave '' status; -Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids +Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode show all slaves status; -Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos +Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Master_SSL_Crl Master_SSL_Crlpath Using_Gtid Gtid_IO_Pos Replicate_Do_Domain_Ids Replicate_Ignore_Domain_Ids Parallel_Mode Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period Gtid_Slave_Pos # # Check error handling # diff --git a/mysql-test/suite/rpl/r/rpl_parallel.result b/mysql-test/suite/rpl/r/rpl_parallel.result index a3b423a49c9..4901c33e662 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel.result +++ b/mysql-test/suite/rpl/r/rpl_parallel.result @@ -1,5 +1,5 @@ -include/rpl_init.inc [topology=1->2] -SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +include/master-slave.inc +[connection master] SET GLOBAL slave_parallel_threads=10; ERROR HY000: This operation cannot be performed as you have a running slave ''; run STOP SLAVE '' first include/stop_slave.inc @@ -923,6 +923,61 @@ a 32 33 34 +*** MDEV-6676 - test syntax of @@slave_parallel_mode *** +Parallel_Mode = 'domain,follow_master_commit' +include/stop_slave.inc +SET GLOBAL slave_parallel_mode='domain,follow_master_commit,transactional'; +ERROR HY000: Invalid use of 'transactional' option for slave_parallel_mode +SET GLOBAL slave_parallel_mode='waiting,transactional,domain'; +Parallel_Mode = 'domain,transactional,waiting' +SET GLOBAL slave_parallel_mode='domain,follow_master_commit'; +Parallel_Mode = 'domain,follow_master_commit' +*** MDEV-6676 - test that empty parallel_mode does not replicate in parallel *** +INSERT INTO t2 VALUES (40); +include/save_master_gtid.inc +SET GLOBAL slave_parallel_mode=''; +SET @old_dbug= @@GLOBAL.debug_dbug; +SET GLOBAL debug_dbug="+d,slave_crash_if_parallel_apply"; +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +a +40 +include/stop_slave.inc +SET GLOBAL debug_dbug=@old_dbug; +*** MDEV-6676 - test disabling domain-based parallel replication *** +SET gtid_domain_id = 1; +INSERT INTO t2 VALUES (41); +INSERT INTO t2 VALUES (42); +INSERT INTO t2 VALUES (43); +INSERT INTO t2 VALUES (44); +INSERT INTO t2 VALUES (45); +INSERT INTO t2 VALUES (46); +DELETE FROM t2 WHERE a >= 41; +SET gtid_domain_id = 2; +INSERT INTO t2 VALUES (41); +INSERT INTO t2 VALUES (42); +INSERT INTO t2 VALUES (43); +INSERT INTO t2 VALUES (44); +INSERT INTO t2 VALUES (45); +INSERT INTO t2 VALUES (46); +SET gtid_domain_id = 0; +include/save_master_gtid.inc +SET GLOBAL slave_parallel_mode=follow_master_commit; +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +a +40 +41 +42 +43 +44 +45 +46 +include/stop_slave.inc +SET GLOBAL slave_parallel_mode='domain,follow_master_commit'; +include/start_slave.inc *** MDEV-6775: Wrong binlog order in parallel replication *** DELETE FROM t4; INSERT INTO t4 VALUES (1,NULL), (3,NULL), (4,4), (5, NULL), (6, 6); @@ -973,7 +1028,7 @@ SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; include/start_slave.inc *** MDEV-7237: Parallel replication: incorrect relaylog position after stop/start the slave *** -INSERT INTO t2 VALUES (40); +INSERT INTO t2 VALUES (50); include/stop_slave.inc CHANGE MASTER TO master_use_gtid=no; SET @old_dbug= @@GLOBAL.debug_dbug; @@ -981,41 +1036,41 @@ SET GLOBAL debug_dbug="+d,rpl_parallel_scheduled_gtid_0_x_100"; SET GLOBAL debug_dbug="+d,rpl_parallel_wait_for_done_trigger"; SET GLOBAL slave_parallel_threads=0; SET GLOBAL slave_parallel_threads=10; -INSERT INTO t2 VALUES (41); -INSERT INTO t2 VALUES (42); +INSERT INTO t2 VALUES (51); +INSERT INTO t2 VALUES (52); SET @old_format= @@binlog_format; SET binlog_format= statement; -DELETE FROM t2 WHERE a=40; +DELETE FROM t2 WHERE a=50; SET binlog_format= @old_format; -INSERT INTO t2 VALUES (43); -INSERT INTO t2 VALUES (44); +INSERT INTO t2 VALUES (53); +INSERT INTO t2 VALUES (54); FLUSH LOGS; -INSERT INTO t2 VALUES (45); +INSERT INTO t2 VALUES (55); SET gtid_seq_no=100; -INSERT INTO t2 VALUES (46); +INSERT INTO t2 VALUES (56); BEGIN; -SELECT * FROM t2 WHERE a=40 FOR UPDATE; +SELECT * FROM t2 WHERE a=50 FOR UPDATE; a -40 +50 include/start_slave.inc SET debug_sync= 'now WAIT_FOR scheduled_gtid_0_x_100'; STOP SLAVE; SET debug_sync= 'now WAIT_FOR wait_for_done_waiting'; ROLLBACK; include/wait_for_slave_sql_to_stop.inc -SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +SELECT * FROM t2 WHERE a >= 50 ORDER BY a; a -41 -42 +51 +52 include/start_slave.inc -SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +SELECT * FROM t2 WHERE a >= 50 ORDER BY a; a -41 -42 -43 -44 -45 -46 +51 +52 +53 +54 +55 +56 include/stop_slave.inc SET GLOBAL debug_dbug=@old_dbug; SET DEBUG_SYNC= 'RESET'; @@ -1024,7 +1079,7 @@ SET GLOBAL slave_parallel_threads=10; CHANGE MASTER TO master_use_gtid=slave_pos; include/start_slave.inc include/stop_slave.inc -SET GLOBAL slave_parallel_threads=@old_parallel_threads; +SET GLOBAL slave_parallel_threads=0; include/start_slave.inc SET DEBUG_SYNC= 'RESET'; DROP function foo; diff --git a/mysql-test/suite/rpl/r/rpl_parallel_multilevel.result b/mysql-test/suite/rpl/r/rpl_parallel_multilevel.result new file mode 100644 index 00000000000..fe45abdc196 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_parallel_multilevel.result @@ -0,0 +1,164 @@ +include/rpl_init.inc [topology=1->2->3->4] +ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +include/stop_slave.inc +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional,waiting'; +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +include/stop_slave.inc +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional,waiting'; +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +include/stop_slave.inc +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional,waiting'; +*** MDEV-6676: Test that @@replicate_allow_parallel is preserved in slave binlog *** +INSERT INTO t1 VALUES(1,1); +BEGIN; +INSERT INTO t1 VALUES(2,1); +INSERT INTO t1 VALUES(3,1); +COMMIT; +SET SESSION replicate_allow_parallel=0; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +SET SESSION replicate_allow_parallel=1; +SELECT * FROM t1 ORDER BY a; +a b +1 1 +2 11 +3 1 +include/save_master_gtid.inc +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 1 +2 11 +3 1 +status +Ok, no retry +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 1 +2 11 +3 1 +status +Ok, no retry +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 1 +2 11 +3 1 +status +Ok, no retry +*** MDEV-6676: Test that the FL_WAITED flag in GTID is preserved in slave binlog *** +include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +SET GLOBAL slave_parallel_mode='domain,transactional'; +include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +SET GLOBAL slave_parallel_mode='domain,transactional'; +include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +SET GLOBAL slave_parallel_mode='domain,transactional'; +BEGIN; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="thd_report_wait_for SIGNAL waiting1"; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="now WAIT_FOR waiting1"; +SET debug_sync="thd_report_wait_for SIGNAL waiting2"; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="now WAIT_FOR waiting2"; +SET debug_sync="thd_report_wait_for SIGNAL waiting3"; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="now WAIT_FOR waiting3"; +SET debug_sync="thd_report_wait_for SIGNAL waiting4"; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="now WAIT_FOR waiting4"; +SET debug_sync="thd_report_wait_for SIGNAL waiting5"; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="now WAIT_FOR waiting5"; +SET debug_sync="thd_report_wait_for SIGNAL waiting6"; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="now WAIT_FOR waiting6"; +SET debug_sync="thd_report_wait_for SIGNAL waiting7"; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="now WAIT_FOR waiting7"; +SET debug_sync="thd_report_wait_for SIGNAL waiting8"; +UPDATE t1 SET b=b+1 WHERE a=2; +SET debug_sync="now WAIT_FOR waiting8"; +COMMIT; +SET debug_sync="RESET"; +COMMIT; +COMMIT; +COMMIT; +COMMIT; +COMMIT; +COMMIT; +COMMIT; +SELECT * FROM t1 ORDER BY a; +a b +1 1 +2 20 +3 1 +include/save_master_gtid.inc +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 1 +2 20 +3 1 +status +Ok, no retry +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 1 +2 20 +3 1 +status +Ok, no retry +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 1 +2 20 +3 1 +status +Ok, no retry +include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +include/start_slave.inc +include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +include/start_slave.inc +include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +include/start_slave.inc +DROP TABLE t1; +include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_parallel_optimistic.result b/mysql-test/suite/rpl/r/rpl_parallel_optimistic.result new file mode 100644 index 00000000000..1f885c7e0e1 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_parallel_optimistic.result @@ -0,0 +1,295 @@ +include/rpl_init.inc [topology=1->2] +ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +include/stop_slave.inc +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional'; +INSERT INTO t1 VALUES(1,1); +BEGIN; +INSERT INTO t1 VALUES(2,1); +INSERT INTO t1 VALUES(3,1); +COMMIT; +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,2); +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,3); +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,4); +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,5); +DELETE FROM t1 WHERE a=3; +INSERT INTO t1 VALUES(3,2); +DELETE FROM t1 WHERE a=1; +INSERT INTO t1 VALUES(1,2); +DELETE FROM t1 WHERE a=3; +INSERT INTO t1 VALUES(3,3); +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,6); +include/save_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 2 +2 6 +3 3 +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 2 +2 6 +3 3 +*** Test a bunch of non-transactional/DDL event groups. *** +include/stop_slave.inc +INSERT INTO t1 VALUES (4,4); +INSERT INTO t1 VALUES (5,5); +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t2 VALUES (1); +CREATE TABLE t3 (a INT PRIMARY KEY) ENGINE=MyISAM; +ALTER TABLE t2 ADD b INT; +INSERT INTO t2 VALUES (2,2); +ALTER TABLE t2 DROP b; +INSERT INTO t2 VALUES (3); +ALTER TABLE t2 ADD c INT; +INSERT INTO t2 VALUES (4,5); +INSERT INTO t2 VALUES (5,5); +INSERT INTO t3 VALUES (1); +UPDATE t2 SET c=NULL WHERE a=4; +ALTER TABLE t2 ADD UNIQUE (c); +INSERT INTO t2 VALUES (6,6); +UPDATE t2 SET c=c+100 WHERE a=2; +INSERT INTO t3(a) VALUES (2); +DELETE FROM t3 WHERE a=2; +INSERT INTO t3(a) VALUES (2); +DELETE FROM t3 WHERE a=2; +ALTER TABLE t3 CHANGE a c INT NOT NULL; +INSERT INTO t3(c) VALUES (2); +DELETE FROM t3 WHERE c=2; +INSERT INTO t3 SELECT a+200 FROM t2; +DELETE FROM t3 WHERE c >= 200; +INSERT INTO t3 SELECT a+200 FROM t2; +include/save_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 2 +2 6 +3 3 +4 4 +5 5 +SELECT * FROM t2 ORDER BY a; +a c +1 NULL +2 NULL +3 NULL +4 NULL +5 5 +6 6 +SELECT * FROM t3 ORDER BY c; +c +1 +201 +202 +203 +204 +205 +206 +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 2 +2 6 +3 3 +4 4 +5 5 +SELECT * FROM t2 ORDER BY a; +a c +1 NULL +2 NULL +3 NULL +4 NULL +5 5 +6 6 +SELECT * FROM t3 ORDER BY c; +c +1 +201 +202 +203 +204 +205 +206 +*** Test @@replicate_allow_parallel. *** +include/stop_slave.inc +UPDATE t1 SET b=10 WHERE a=3; +SET SESSION replicate_allow_parallel=0; +UPDATE t1 SET b=20 WHERE a=3; +UPDATE t1 SET b=30 WHERE a=3; +UPDATE t1 SET b=50 WHERE a=3; +UPDATE t1 SET b=80 WHERE a=3; +UPDATE t1 SET b=130 WHERE a=3; +UPDATE t1 SET b=210 WHERE a=3; +UPDATE t1 SET b=340 WHERE a=3; +UPDATE t1 SET b=550 WHERE a=3; +UPDATE t1 SET b=890 WHERE a=3; +SET SESSION replicate_allow_parallel=1; +SELECT * FROM t1 ORDER BY a; +a b +1 2 +2 6 +3 890 +4 4 +5 5 +include/save_master_gtid.inc +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 2 +2 6 +3 890 +4 4 +5 5 +status +Ok, no retry +*** Test that we do not replicate in parallel transactions that had row lock waits on the master *** +include/stop_slave.inc +BEGIN; +UPDATE t1 SET b=b+1 WHERE a=3; +SET debug_sync='thd_report_wait_for SIGNAL waiting1'; +UPDATE t1 SET b=1001 WHERE a=3; +SET debug_sync='now WAIT_FOR waiting1'; +BEGIN; +UPDATE t1 SET b=1002 WHERE a=5; +SET debug_sync='thd_report_wait_for SIGNAL waiting2'; +UPDATE t1 SET b=102 WHERE a=3; +SET debug_sync='now WAIT_FOR waiting2'; +UPDATE t1 SET b=1000 WHERE a=1; +SET debug_sync='thd_report_wait_for SIGNAL waiting3'; +UPDATE t1 SET b=1003 WHERE a=5; +SET debug_sync='now WAIT_FOR waiting3'; +SET debug_sync='thd_report_wait_for SIGNAL waiting4'; +UPDATE t1 SET b=1004 WHERE a=3; +SET debug_sync='now WAIT_FOR waiting4'; +SET debug_sync='thd_report_wait_for SIGNAL waiting5'; +UPDATE t1 SET b=1005 WHERE a=5; +SET debug_sync='now WAIT_FOR waiting5'; +SET debug_sync='thd_report_wait_for SIGNAL waiting6'; +UPDATE t1 SET b=1006 WHERE a=1; +SET debug_sync='now WAIT_FOR waiting6'; +SET debug_sync='thd_report_wait_for SIGNAL waiting7'; +UPDATE t1 SET b=1007 WHERE a=5; +SET debug_sync='now WAIT_FOR waiting7'; +SET debug_sync='thd_report_wait_for SIGNAL waiting8'; +UPDATE t1 SET b=1008 WHERE a=3; +SET debug_sync='now WAIT_FOR waiting8'; +COMMIT; +COMMIT; +SET debug_sync='RESET'; +SELECT * FROM t1 ORDER BY a; +a b +1 1006 +2 6 +3 1008 +4 4 +5 1007 +include/save_master_gtid.inc +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 1006 +2 6 +3 1008 +4 4 +5 1007 +status +Ok, no retry +*** Test that we replicate correctly when using READ COMMITTED and binlog_format=MIXED on the slave *** +include/stop_slave.inc +SET @old_format= @@GLOBAL.binlog_format; +SET GLOBAL binlog_format= MIXED; +SET @old_isolation= @@GLOBAL.tx_isolation; +SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; +SET GLOBAL slave_parallel_threads=0; +SET GLOBAL slave_parallel_threads=10; +DROP TABLE t1, t2; +CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +CREATE TABLE t2 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1,0), (2,0), (3,0); +INSERT INTO t2 VALUES (1,0), (2,0); +INSERT INTO t1 SELECT 4, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 4, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 5, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 5, COUNT(*) FROM t1; +INSERT INTO t2 SELECT 6, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 6, COUNT(*) FROM t2; +INSERT INTO t1 SELECT 7, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 7, COUNT(*) FROM t1; +INSERT INTO t2 SELECT 8, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 8, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 9, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 9, COUNT(*) FROM t2; +INSERT INTO t1 SELECT 10, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 10, COUNT(*) FROM t1; +SELECT * FROM t1 ORDER BY a; +a b +1 0 +2 0 +3 0 +4 2 +5 3 +6 5 +7 5 +8 7 +9 8 +10 8 +SELECT * FROM t2 ORDER BY a; +a b +1 0 +2 0 +4 4 +5 5 +6 5 +7 7 +8 7 +9 8 +10 10 +include/save_master_gtid.inc +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 0 +2 0 +3 0 +4 2 +5 3 +6 5 +7 5 +8 7 +9 8 +10 8 +SELECT * FROM t2 ORDER BY a; +a b +1 0 +2 0 +4 4 +5 5 +6 5 +7 7 +8 7 +9 8 +10 10 +include/stop_slave.inc +SET GLOBAL binlog_format= @old_format; +SET GLOBAL tx_isolation= @old_isolation; +include/start_slave.inc +include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +include/start_slave.inc +DROP TABLE t1, t2, t3; +include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_parallel_optimistic_nobinlog.result b/mysql-test/suite/rpl/r/rpl_parallel_optimistic_nobinlog.result new file mode 100644 index 00000000000..d51eb295605 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_parallel_optimistic_nobinlog.result @@ -0,0 +1,85 @@ +include/rpl_init.inc [topology=1->2] +ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +CREATE TABLE t2 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1,0), (2,0), (3,0); +INSERT INTO t2 VALUES (1,0), (2,0); +SET @old_isolation= @@GLOBAL.tx_isolation; +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +include/stop_slave.inc +SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional,waiting'; +*** Test that we replicate correctly when using READ COMMITTED and --log-slave-updates=0 on the slave *** +INSERT INTO t1 SELECT 4, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 4, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 5, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 5, COUNT(*) FROM t1; +INSERT INTO t2 SELECT 6, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 6, COUNT(*) FROM t2; +INSERT INTO t1 SELECT 7, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 7, COUNT(*) FROM t1; +INSERT INTO t2 SELECT 8, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 8, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 9, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 9, COUNT(*) FROM t2; +INSERT INTO t1 SELECT 10, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 10, COUNT(*) FROM t1; +SELECT * FROM t1 ORDER BY a; +a b +1 0 +2 0 +3 0 +4 2 +5 3 +6 5 +7 5 +8 7 +9 8 +10 8 +SELECT * FROM t2 ORDER BY a; +a b +1 0 +2 0 +4 4 +5 5 +6 5 +7 7 +8 7 +9 8 +10 10 +include/save_master_gtid.inc +include/start_slave.inc +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 0 +2 0 +3 0 +4 2 +5 3 +6 5 +7 5 +8 7 +9 8 +10 8 +SELECT * FROM t2 ORDER BY a; +a b +1 0 +2 0 +4 4 +5 5 +6 5 +7 7 +8 7 +9 8 +10 10 +include/stop_slave.inc +SET GLOBAL tx_isolation= @old_isolation; +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +include/start_slave.inc +DROP TABLE t1, t2; +include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel.test b/mysql-test/suite/rpl/t/rpl_parallel.test index a56d45848a5..a66095d10ea 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel.test +++ b/mysql-test/suite/rpl/t/rpl_parallel.test @@ -1,13 +1,12 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---let $rpl_topology=1->2 ---source include/rpl_init.inc +--source include/master-slave.inc # Test various aspects of parallel replication. --connection server_2 -SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +--let $old_parallel_threads=`SELECT @@GLOBAL.slave_parallel_threads` --error ER_SLAVE_MUST_STOP SET GLOBAL slave_parallel_threads=10; --source include/stop_slave.inc @@ -1466,6 +1465,71 @@ SET sql_slave_skip_counter= 1; SELECT * FROM t2 WHERE a >= 30 ORDER BY a; +--echo *** MDEV-6676 - test syntax of @@slave_parallel_mode *** +--connection server_2 + +--let $status_items= Parallel_Mode +--source include/show_slave_status.inc +--source include/stop_slave.inc +--error ER_INVALID_SLAVE_PARALLEL_MODE +SET GLOBAL slave_parallel_mode='domain,follow_master_commit,transactional'; +SET GLOBAL slave_parallel_mode='waiting,transactional,domain'; +--let $status_items= Parallel_Mode +--source include/show_slave_status.inc +SET GLOBAL slave_parallel_mode='domain,follow_master_commit'; +--let $status_items= Parallel_Mode +--source include/show_slave_status.inc + + +--echo *** MDEV-6676 - test that empty parallel_mode does not replicate in parallel *** +--connection server_1 +INSERT INTO t2 VALUES (40); +--source include/save_master_gtid.inc + +--connection server_2 +SET GLOBAL slave_parallel_mode=''; +# Test that we do not use parallel apply, by injecting an unconditional +# crash in the parallel apply code. +SET @old_dbug= @@GLOBAL.debug_dbug; +SET GLOBAL debug_dbug="+d,slave_crash_if_parallel_apply"; +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +--source include/stop_slave.inc +SET GLOBAL debug_dbug=@old_dbug; + + +--echo *** MDEV-6676 - test disabling domain-based parallel replication *** +--connection server_1 +# Let's do a bunch of transactions that will conflict if run out-of-order in +# domain-based parallel replication mode. +SET gtid_domain_id = 1; +INSERT INTO t2 VALUES (41); +INSERT INTO t2 VALUES (42); +INSERT INTO t2 VALUES (43); +INSERT INTO t2 VALUES (44); +INSERT INTO t2 VALUES (45); +INSERT INTO t2 VALUES (46); +DELETE FROM t2 WHERE a >= 41; +SET gtid_domain_id = 2; +INSERT INTO t2 VALUES (41); +INSERT INTO t2 VALUES (42); +INSERT INTO t2 VALUES (43); +INSERT INTO t2 VALUES (44); +INSERT INTO t2 VALUES (45); +INSERT INTO t2 VALUES (46); +SET gtid_domain_id = 0; +--source include/save_master_gtid.inc +--connection server_2 +SET GLOBAL slave_parallel_mode=follow_master_commit; +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +--source include/stop_slave.inc +SET GLOBAL slave_parallel_mode='domain,follow_master_commit'; +--source include/start_slave.inc + + --echo *** MDEV-6775: Wrong binlog order in parallel replication *** --connection server_1 # A bit tricky bug to reproduce. On the master, we binlog in statement-mode @@ -1537,7 +1601,7 @@ SET GLOBAL slave_parallel_threads=10; --echo *** MDEV-7237: Parallel replication: incorrect relaylog position after stop/start the slave *** --connection server_1 -INSERT INTO t2 VALUES (40); +INSERT INTO t2 VALUES (50); --save_master_pos --connection server_2 @@ -1558,28 +1622,28 @@ SET GLOBAL slave_parallel_threads=10; --connection server_1 # Setup some transaction for the slave to replicate. -INSERT INTO t2 VALUES (41); -INSERT INTO t2 VALUES (42); +INSERT INTO t2 VALUES (51); +INSERT INTO t2 VALUES (52); # Need to log the DELETE in statement format, so we can see it in processlist. SET @old_format= @@binlog_format; SET binlog_format= statement; -DELETE FROM t2 WHERE a=40; +DELETE FROM t2 WHERE a=50; SET binlog_format= @old_format; -INSERT INTO t2 VALUES (43); -INSERT INTO t2 VALUES (44); +INSERT INTO t2 VALUES (53); +INSERT INTO t2 VALUES (54); # Force the slave to switch to a new relay log file. FLUSH LOGS; -INSERT INTO t2 VALUES (45); +INSERT INTO t2 VALUES (55); # Inject a GTID 0-1-100, which will trigger a DEBUG_SYNC signal when this # transaction has been fetched by a worker thread. SET gtid_seq_no=100; -INSERT INTO t2 VALUES (46); +INSERT INTO t2 VALUES (56); --save_master_pos --connection con_temp2 # Temporarily block the DELETE on a=40 from completing. BEGIN; -SELECT * FROM t2 WHERE a=40 FOR UPDATE; +SELECT * FROM t2 WHERE a=50 FOR UPDATE; --connection server_2 @@ -1587,7 +1651,7 @@ SELECT * FROM t2 WHERE a=40 FOR UPDATE; # Wait for a worker thread to start on the DELETE that will be blocked # temporarily by the SELECT FOR UPDATE. ---let $wait_condition= SELECT count(*) > 0 FROM information_schema.processlist WHERE state='updating' and info LIKE '%DELETE FROM t2 WHERE a=40%' +--let $wait_condition= SELECT count(*) > 0 FROM information_schema.processlist WHERE state='updating' and info LIKE '%DELETE FROM t2 WHERE a=50%' --source include/wait_condition.inc # The DBUG injection set above will make the worker thread signal the following @@ -1620,13 +1684,13 @@ ROLLBACK; --connection server_2 reap; --source include/wait_for_slave_sql_to_stop.inc -SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +SELECT * FROM t2 WHERE a >= 50 ORDER BY a; # Now restart the slave. With the bug present, this would start at an # incorrect relay log position, causing relay log read error (or if unlucky, # silently skip a number of events). --source include/start_slave.inc --sync_with_master -SELECT * FROM t2 WHERE a >= 40 ORDER BY a; +SELECT * FROM t2 WHERE a >= 50 ORDER BY a; --source include/stop_slave.inc SET GLOBAL debug_dbug=@old_dbug; SET DEBUG_SYNC= 'RESET'; @@ -1639,7 +1703,7 @@ CHANGE MASTER TO master_use_gtid=slave_pos; # Clean up. --connection server_2 --source include/stop_slave.inc -SET GLOBAL slave_parallel_threads=@old_parallel_threads; +eval SET GLOBAL slave_parallel_threads=$old_parallel_threads; --source include/start_slave.inc SET DEBUG_SYNC= 'RESET'; diff --git a/mysql-test/suite/rpl/t/rpl_parallel_multilevel.cnf b/mysql-test/suite/rpl/t/rpl_parallel_multilevel.cnf new file mode 100644 index 00000000000..3ff94e458ce --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_parallel_multilevel.cnf @@ -0,0 +1,24 @@ +!include ../my.cnf + +[mysqld.1] +log-slave-updates +loose-innodb + +[mysqld.2] +log-slave-updates +loose-innodb + +[mysqld.3] +log-slave-updates +loose-innodb + +[mysqld.4] +log-slave-updates +loose-innodb + +[ENV] +SERVER_MYPORT_3= @mysqld.3.port +SERVER_MYSOCK_3= @mysqld.3.socket + +SERVER_MYPORT_4= @mysqld.4.port +SERVER_MYSOCK_4= @mysqld.4.socket diff --git a/mysql-test/suite/rpl/t/rpl_parallel_multilevel.test b/mysql-test/suite/rpl/t/rpl_parallel_multilevel.test new file mode 100644 index 00000000000..8f6ae7f2e16 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_parallel_multilevel.test @@ -0,0 +1,284 @@ +--source include/have_innodb.inc +--source include/have_debug_sync.inc +--let $rpl_topology=1->2->3->4 +--source include/rpl_init.inc + +# Test parallel replication with a multi-level replication hierarchy. + +--connection server_1 +ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +--save_master_pos + +--connection server_2 +--sync_with_master +--save_master_pos +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +--source include/stop_slave.inc +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional,waiting'; + + +--connection server_3 +--sync_with_master +--save_master_pos +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +--source include/stop_slave.inc +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional,waiting'; + + +--connection server_4 +--sync_with_master +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +--source include/stop_slave.inc +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional,waiting'; + + +--echo *** MDEV-6676: Test that @@replicate_allow_parallel is preserved in slave binlog *** +--connection server_1 + +INSERT INTO t1 VALUES(1,1); +BEGIN; +INSERT INTO t1 VALUES(2,1); +INSERT INTO t1 VALUES(3,1); +COMMIT; +# Do a lot of updates on same row in sequence. These would be likely to cause +# conflicts and rollbacks in optimistic parallel replication, but we disable +# that by disabling @@replicate_allow_parallel. We can test that the flag is +# preserved down the replication hierarchy by checking that no slave retries +# are made. +SET SESSION replicate_allow_parallel=0; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +UPDATE t1 SET b=b+1 WHERE a=2; +SET SESSION replicate_allow_parallel=1; +SELECT * FROM t1 ORDER BY a; +--source include/save_master_gtid.inc + +--connection server_2 +--let $retry1= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +--let $retry2= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--disable_query_log +eval SELECT IF($retry1=$retry2, "Ok, no retry", + CONCAT("ERROR: ", $retry2-$retry1, " retries during replication (was ", + $retry1, " now ", $retry2, ")")) AS status; +--enable_query_log + +--connection server_3 +--let $retry1= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +--let $retry2= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--disable_query_log +eval SELECT IF($retry1=$retry2, "Ok, no retry", + CONCAT("ERROR: ", $retry2-$retry1, " retries during replication (was ", + $retry1, " now ", $retry2, ")")) AS status; +--enable_query_log + +--connection server_4 +--let $retry1= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +--let $retry2= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--disable_query_log +eval SELECT IF($retry1=$retry2, "Ok, no retry", + CONCAT("ERROR: ", $retry2-$retry1, " retries during replication (was ", + $retry1, " now ", $retry2, ")")) AS status; +--enable_query_log + + +--echo *** MDEV-6676: Test that the FL_WAITED flag in GTID is preserved in slave binlog *** + +--connection server_2 +--source include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +SET GLOBAL slave_parallel_mode='domain,transactional'; + + +--connection server_3 +--source include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +SET GLOBAL slave_parallel_mode='domain,transactional'; + + +--connection server_4 +--source include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +SET GLOBAL slave_parallel_mode='domain,transactional'; + +--connection server_1 +# Do a lot of updates on same row in sequence. Ensure that all of these but the +# first have to do a lock wait on the master, setting FL_WAITED in the GTID +# event. This should cause all slaves to not attempt to run those updates in +# parallel with prior events, so that no retries are made. + +BEGIN; +UPDATE t1 SET b=b+1 WHERE a=2; + +--connect (con_temp1,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +SET debug_sync="thd_report_wait_for SIGNAL waiting1"; +send UPDATE t1 SET b=b+1 WHERE a=2; +--connection server_1 +SET debug_sync="now WAIT_FOR waiting1"; + +--connect (con_temp2,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +SET debug_sync="thd_report_wait_for SIGNAL waiting2"; +send UPDATE t1 SET b=b+1 WHERE a=2; +--connection server_1 +SET debug_sync="now WAIT_FOR waiting2"; + +--connect (con_temp3,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +SET debug_sync="thd_report_wait_for SIGNAL waiting3"; +send UPDATE t1 SET b=b+1 WHERE a=2; +--connection server_1 +SET debug_sync="now WAIT_FOR waiting3"; + +--connect (con_temp4,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +SET debug_sync="thd_report_wait_for SIGNAL waiting4"; +send UPDATE t1 SET b=b+1 WHERE a=2; +--connection server_1 +SET debug_sync="now WAIT_FOR waiting4"; + +--connect (con_temp5,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +SET debug_sync="thd_report_wait_for SIGNAL waiting5"; +send UPDATE t1 SET b=b+1 WHERE a=2; +--connection server_1 +SET debug_sync="now WAIT_FOR waiting5"; + +--connect (con_temp6,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +SET debug_sync="thd_report_wait_for SIGNAL waiting6"; +send UPDATE t1 SET b=b+1 WHERE a=2; +--connection server_1 +SET debug_sync="now WAIT_FOR waiting6"; + +--connect (con_temp7,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +SET debug_sync="thd_report_wait_for SIGNAL waiting7"; +send UPDATE t1 SET b=b+1 WHERE a=2; +--connection server_1 +SET debug_sync="now WAIT_FOR waiting7"; + +--connect (con_temp8,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +SET debug_sync="thd_report_wait_for SIGNAL waiting8"; +send UPDATE t1 SET b=b+1 WHERE a=2; +--connection server_1 +SET debug_sync="now WAIT_FOR waiting8"; + +COMMIT; +SET debug_sync="RESET"; + +--connection con_temp1 +reap; + +COMMIT; +--connection con_temp2 +reap; + +COMMIT; +--connection con_temp3 +reap; + +COMMIT; +--connection con_temp4 +reap; + +COMMIT; +--connection con_temp5 +reap; + +COMMIT; +--connection con_temp6 +reap; + +COMMIT; +--connection con_temp7 +reap; + +COMMIT; +--connection con_temp8 +reap; + +--connection server_1 +SELECT * FROM t1 ORDER BY a; +--source include/save_master_gtid.inc + +--connection server_2 +--let $retry1= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +--let $retry2= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--disable_query_log +eval SELECT IF($retry1=$retry2, "Ok, no retry", + CONCAT("ERROR: ", $retry2-$retry1, " retries during replication (was ", + $retry1, " now ", $retry2, ")")) AS status; +--enable_query_log + +--connection server_3 +--let $retry1= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +--let $retry2= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--disable_query_log +eval SELECT IF($retry1=$retry2, "Ok, no retry", + CONCAT("ERROR: ", $retry2-$retry1, " retries during replication (was ", + $retry1, " now ", $retry2, ")")) AS status; +--enable_query_log + +--connection server_4 +--let $retry1= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +--let $retry2= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--disable_query_log +eval SELECT IF($retry1=$retry2, "Ok, no retry", + CONCAT("ERROR: ", $retry2-$retry1, " retries during replication (was ", + $retry1, " now ", $retry2, ")")) AS status; +--enable_query_log + + +# Clean up + +--connection server_2 +--source include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +--source include/start_slave.inc + +--connection server_3 +--source include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +--source include/start_slave.inc + +--connection server_4 +--source include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +--source include/start_slave.inc + +--connection server_1 +DROP TABLE t1; + +--source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel_optimistic.test b/mysql-test/suite/rpl/t/rpl_parallel_optimistic.test new file mode 100644 index 00000000000..c1f35588267 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_parallel_optimistic.test @@ -0,0 +1,319 @@ +--source include/have_innodb.inc +--source include/have_debug_sync.inc +--let $rpl_topology=1->2 +--source include/rpl_init.inc + +--connection server_1 +ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +--save_master_pos + +--connection server_2 +--sync_with_master +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +--source include/stop_slave.inc +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional'; + + +--connection server_1 + +INSERT INTO t1 VALUES(1,1); +BEGIN; +INSERT INTO t1 VALUES(2,1); +INSERT INTO t1 VALUES(3,1); +COMMIT; + +# Do a bunch of INSERT/DELETE on the same rows, bound to conflict. +# We will get a lot of rollbacks, probably, but they should be handled without +# any visible errors. + +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,2); +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,3); +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,4); +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,5); + +DELETE FROM t1 WHERE a=3; +INSERT INTO t1 VALUES(3,2); +DELETE FROM t1 WHERE a=1; +INSERT INTO t1 VALUES(1,2); +DELETE FROM t1 WHERE a=3; +INSERT INTO t1 VALUES(3,3); + +DELETE FROM t1 WHERE a=2; +INSERT INTO t1 VALUES (2,6); +--source include/save_master_gtid.inc +SELECT * FROM t1 ORDER BY a; + +--connection server_2 +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +#SHOW STATUS LIKE 'Slave_retried_transactions'; + + +--echo *** Test a bunch of non-transactional/DDL event groups. *** + +--connection server_2 +--source include/stop_slave.inc + +--connection server_1 + +INSERT INTO t1 VALUES (4,4); +INSERT INTO t1 VALUES (5,5); +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t2 VALUES (1); +CREATE TABLE t3 (a INT PRIMARY KEY) ENGINE=MyISAM; +ALTER TABLE t2 ADD b INT; +INSERT INTO t2 VALUES (2,2); +ALTER TABLE t2 DROP b; +INSERT INTO t2 VALUES (3); +ALTER TABLE t2 ADD c INT; +INSERT INTO t2 VALUES (4,5); +INSERT INTO t2 VALUES (5,5); +INSERT INTO t3 VALUES (1); +UPDATE t2 SET c=NULL WHERE a=4; +ALTER TABLE t2 ADD UNIQUE (c); +INSERT INTO t2 VALUES (6,6); +UPDATE t2 SET c=c+100 WHERE a=2; +INSERT INTO t3(a) VALUES (2); +DELETE FROM t3 WHERE a=2; +INSERT INTO t3(a) VALUES (2); +DELETE FROM t3 WHERE a=2; +ALTER TABLE t3 CHANGE a c INT NOT NULL; +INSERT INTO t3(c) VALUES (2); +DELETE FROM t3 WHERE c=2; +INSERT INTO t3 SELECT a+200 FROM t2; +DELETE FROM t3 WHERE c >= 200; +INSERT INTO t3 SELECT a+200 FROM t2; +--source include/save_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +SELECT * FROM t3 ORDER BY c; + +--connection server_2 +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +SELECT * FROM t3 ORDER BY c; +#SHOW STATUS LIKE 'Slave_retried_transactions'; + + +--echo *** Test @@replicate_allow_parallel. *** + +--connection server_2 +--source include/stop_slave.inc +--let $retry1= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) + +--connection server_1 +# We do a bunch of conflicting transactions on the master with +# replicate_allow_parallel set to false, and check that we do not +# get any retries on the slave. + +UPDATE t1 SET b=10 WHERE a=3; +SET SESSION replicate_allow_parallel=0; +UPDATE t1 SET b=20 WHERE a=3; +UPDATE t1 SET b=30 WHERE a=3; +UPDATE t1 SET b=50 WHERE a=3; +UPDATE t1 SET b=80 WHERE a=3; +UPDATE t1 SET b=130 WHERE a=3; +UPDATE t1 SET b=210 WHERE a=3; +UPDATE t1 SET b=340 WHERE a=3; +UPDATE t1 SET b=550 WHERE a=3; +UPDATE t1 SET b=890 WHERE a=3; +SET SESSION replicate_allow_parallel=1; +SELECT * FROM t1 ORDER BY a; +--source include/save_master_gtid.inc + +--connection server_2 +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +--let $retry2= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--disable_query_log +eval SELECT IF($retry1=$retry2, "Ok, no retry", + CONCAT("ERROR: ", $retry2-$retry1, " retries during replication (was ", + $retry1, " now ", $retry2, ")")) AS status; +--enable_query_log + + +--echo *** Test that we do not replicate in parallel transactions that had row lock waits on the master *** + +--connection server_2 +--source include/stop_slave.inc +--let $retry1= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) + +--connection server_1 +# Setup a bunch of transactions that all needed to wait. +--connect (m1,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +--connect (m2,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +--connect (m3,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +--connect (m4,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +--connect (m5,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +--connect (m6,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +--connect (m7,127.0.0.1,root,,test,$SERVER_MYPORT_1,) +--connect (m8,127.0.0.1,root,,test,$SERVER_MYPORT_1,) + +--connection default +BEGIN; UPDATE t1 SET b=b+1 WHERE a=3; + +--connection m1 +SET debug_sync='thd_report_wait_for SIGNAL waiting1'; +send UPDATE t1 SET b=1001 WHERE a=3; +--connection default +SET debug_sync='now WAIT_FOR waiting1'; + +--connection m2 +BEGIN; +UPDATE t1 SET b=1002 WHERE a=5; +SET debug_sync='thd_report_wait_for SIGNAL waiting2'; +send UPDATE t1 SET b=102 WHERE a=3; +--connection default +SET debug_sync='now WAIT_FOR waiting2'; + +UPDATE t1 SET b=1000 WHERE a=1; +--connection m3 +SET debug_sync='thd_report_wait_for SIGNAL waiting3'; +send UPDATE t1 SET b=1003 WHERE a=5; +--connection default +SET debug_sync='now WAIT_FOR waiting3'; + +--connection m4 +SET debug_sync='thd_report_wait_for SIGNAL waiting4'; +send UPDATE t1 SET b=1004 WHERE a=3; +--connection default +SET debug_sync='now WAIT_FOR waiting4'; + +--connection m5 +SET debug_sync='thd_report_wait_for SIGNAL waiting5'; +send UPDATE t1 SET b=1005 WHERE a=5; +--connection default +SET debug_sync='now WAIT_FOR waiting5'; + +--connection m6 +SET debug_sync='thd_report_wait_for SIGNAL waiting6'; +send UPDATE t1 SET b=1006 WHERE a=1; +--connection default +SET debug_sync='now WAIT_FOR waiting6'; + +--connection m7 +SET debug_sync='thd_report_wait_for SIGNAL waiting7'; +send UPDATE t1 SET b=1007 WHERE a=5; +--connection default +SET debug_sync='now WAIT_FOR waiting7'; + +--connection m8 +SET debug_sync='thd_report_wait_for SIGNAL waiting8'; +send UPDATE t1 SET b=1008 WHERE a=3; +--connection default +SET debug_sync='now WAIT_FOR waiting8'; + +--connection default +COMMIT; +--connection m1 +REAP; +--connection m2 +REAP; +COMMIT; +--connection m3 +REAP; +--connection m4 +REAP; +--connection m5 +REAP; +--connection m6 +REAP; +--connection m7 +REAP; +--connection m8 +REAP; +--connection default +SET debug_sync='RESET'; +SELECT * FROM t1 ORDER BY a; +--source include/save_master_gtid.inc + +--connection server_2 +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +--let $retry2= query_get_value(SHOW STATUS LIKE 'Slave_retried_transactions', Value, 1) +--disable_query_log +eval SELECT IF($retry1=$retry2, "Ok, no retry", + CONCAT("ERROR: ", $retry2-$retry1, " retries during replication (was ", + $retry1, " now ", $retry2, ")")) AS status; +--enable_query_log + + +--echo *** Test that we replicate correctly when using READ COMMITTED and binlog_format=MIXED on the slave *** + +--connection server_2 +--source include/stop_slave.inc +SET @old_format= @@GLOBAL.binlog_format; +# Use MIXED format; we cannot binlog ROW events on slave in STATEMENT format. +SET GLOBAL binlog_format= MIXED; +SET @old_isolation= @@GLOBAL.tx_isolation; +SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; +# Reset the worker threads to make the new settings take effect. +SET GLOBAL slave_parallel_threads=0; +SET GLOBAL slave_parallel_threads=10; + +--connection server_1 +DROP TABLE t1, t2; +CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +CREATE TABLE t2 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1,0), (2,0), (3,0); +INSERT INTO t2 VALUES (1,0), (2,0); +INSERT INTO t1 SELECT 4, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 4, COUNT(*) FROM t1; + +INSERT INTO t1 SELECT 5, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 5, COUNT(*) FROM t1; + +INSERT INTO t2 SELECT 6, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 6, COUNT(*) FROM t2; + +INSERT INTO t1 SELECT 7, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 7, COUNT(*) FROM t1; + +INSERT INTO t2 SELECT 8, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 8, COUNT(*) FROM t2; + +INSERT INTO t2 SELECT 9, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 9, COUNT(*) FROM t2; + +INSERT INTO t1 SELECT 10, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 10, COUNT(*) FROM t1; + +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +--source include/save_master_gtid.inc + +--connection server_2 +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; + +--source include/stop_slave.inc +SET GLOBAL binlog_format= @old_format; +SET GLOBAL tx_isolation= @old_isolation; +--source include/start_slave.inc + + +--connection server_2 +--source include/stop_slave.inc +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +--source include/start_slave.inc + +--connection server_1 +DROP TABLE t1, t2, t3; + +--source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf b/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf new file mode 100644 index 00000000000..0ea0d951568 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf @@ -0,0 +1,9 @@ +!include ../my.cnf + +[mysqld.1] +log-slave-updates=0 +loose-innodb + +[mysqld.2] +log-slave-updates=0 +loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.test b/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.test new file mode 100644 index 00000000000..63a994d0fff --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.test @@ -0,0 +1,74 @@ +--source include/have_innodb.inc +--source include/have_binlog_format_statement.inc +--let $rpl_topology=1->2 +--source include/rpl_init.inc + +--connection server_1 +ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +CREATE TABLE t2 (a int PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1,0), (2,0), (3,0); +INSERT INTO t2 VALUES (1,0), (2,0); +--save_master_pos + + +--connection server_2 +--sync_with_master +SET @old_isolation= @@GLOBAL.tx_isolation; +SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; +--source include/stop_slave.inc +SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; +SET GLOBAL slave_parallel_threads=10; +CHANGE MASTER TO master_use_gtid=slave_pos; +SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode; +SET GLOBAL slave_parallel_mode='domain,transactional,waiting'; + + +--echo *** Test that we replicate correctly when using READ COMMITTED and --log-slave-updates=0 on the slave *** + +--connection server_1 + +INSERT INTO t1 SELECT 4, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 4, COUNT(*) FROM t1; + +INSERT INTO t1 SELECT 5, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 5, COUNT(*) FROM t1; + +INSERT INTO t2 SELECT 6, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 6, COUNT(*) FROM t2; + +INSERT INTO t1 SELECT 7, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 7, COUNT(*) FROM t1; + +INSERT INTO t2 SELECT 8, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 8, COUNT(*) FROM t2; + +INSERT INTO t2 SELECT 9, COUNT(*) FROM t1; +INSERT INTO t1 SELECT 9, COUNT(*) FROM t2; + +INSERT INTO t1 SELECT 10, COUNT(*) FROM t2; +INSERT INTO t2 SELECT 10, COUNT(*) FROM t1; + +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +--source include/save_master_gtid.inc + +--connection server_2 +--source include/start_slave.inc +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; + + +--connection server_2 +--source include/stop_slave.inc +SET GLOBAL tx_isolation= @old_isolation; +SET GLOBAL slave_parallel_mode=@old_parallel_mode; +SET GLOBAL slave_parallel_threads=@old_parallel_threads; +--source include/start_slave.inc + +--connection server_1 +DROP TABLE t1, t2; + +--source include/rpl_end.inc + diff --git a/mysql-test/suite/sys_vars/r/replicate_allow_parallel_basic.result b/mysql-test/suite/sys_vars/r/replicate_allow_parallel_basic.result new file mode 100644 index 00000000000..f612bb7ec0c --- /dev/null +++ b/mysql-test/suite/sys_vars/r/replicate_allow_parallel_basic.result @@ -0,0 +1,15 @@ +SELECT @@global.replicate_allow_parallel; +ERROR HY000: Variable 'replicate_allow_parallel' is a SESSION variable +SET GLOBAL replicate_allow_parallel= 1; +ERROR HY000: Variable 'replicate_allow_parallel' is a SESSION variable and can't be used with SET GLOBAL +SELECT @@session.replicate_allow_parallel; +@@session.replicate_allow_parallel +1 +SET SESSION replicate_allow_parallel= 0; +SELECT @@session.replicate_allow_parallel; +@@session.replicate_allow_parallel +0 +SET SESSION replicate_allow_parallel= 1; +SELECT @@session.replicate_allow_parallel; +@@session.replicate_allow_parallel +1 diff --git a/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result b/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result new file mode 100644 index 00000000000..e2c52ee6fa1 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result @@ -0,0 +1,41 @@ +SET SESSION slave_parallel_mode= ''; +ERROR HY000: Variable 'slave_parallel_mode' is a GLOBAL variable and should be set with SET GLOBAL +SELECT @@slave_parallel_mode; +@@slave_parallel_mode +domain +SELECT @@m1.slave_parallel_mode; +ERROR HY000: There is no master connection 'm1' +CHANGE MASTER TO master_host='127.0.0.1', master_port=3310, master_user='root'; +SELECT @@``.slave_parallel_mode; +@@``.slave_parallel_mode +domain +SELECT @@slave_parallel_mode; +@@slave_parallel_mode +domain +Parallel_Mode = 'domain' +SELECT @@m2.slave_parallel_mode; +ERROR HY000: There is no master connection 'm2' +SET GLOBAL m2.slave_parallel_mode = ''; +ERROR HY000: There is no master connection 'm2' +CHANGE MASTER 'm1' TO master_host='127.0.0.1', master_port=3311, master_user='root'; +SELECT @@m1.slave_parallel_mode; +@@m1.slave_parallel_mode +transactional +Parallel_Mode = 'domain' +SET GLOBAL m1.slave_parallel_mode= follow_master_commit; +Parallel_Mode = 'domain' +SET default_master_connection= 'm1'; +SELECT @@slave_parallel_mode; +@@slave_parallel_mode +follow_master_commit +SET GLOBAL slave_parallel_mode= waiting; +SELECT @@slave_parallel_mode; +@@slave_parallel_mode +waiting +Parallel_Mode = 'waiting' +SET default_master_connection= ''; +SELECT @@slave_parallel_mode; +@@slave_parallel_mode +domain +RESET SLAVE ALL; +RESET SLAVE 'm1' ALL; diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 90ea58fd547..006b9a94bc0 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -3395,6 +3395,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME REPLICATE_ALLOW_PARALLEL +SESSION_VALUE ON +GLOBAL_VALUE NULL +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE ON +VARIABLE_SCOPE SESSION ONLY +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT If set when a transaction is written to the binlog, that transaction is allowed to replicate in parallel on a slave where slave_parallel_mode is set to "transactional". Can be cleared for transactions that are likely to cause a conflict if replicated in parallel, to avoid unnecessary rollback and retry. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME REPLICATE_ANNOTATE_ROW_EVENTS SESSION_VALUE NULL GLOBAL_VALUE OFF @@ -3801,6 +3815,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME SLAVE_PARALLEL_MODE +SESSION_VALUE NULL +GLOBAL_VALUE domain,follow_master_commit +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE domain,follow_master_commit +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE SET +VARIABLE_COMMENT Controls what transactions are applied in parallel when using --slave-parallel-threads. Syntax: slave_parallel_mode=value[,value...], where "value" could be one or more of: "domain", to apply different replication domains in parallel; "follow_master_commit", to apply in parallel transactions that group-committed together on the master; "transactional", to optimistically try to apply all transactional DML in parallel; and "waiting" to extend "transactional" to even transactions that had to wait on the master. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST domain,follow_master_commit,transactional,waiting +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME SLAVE_PARALLEL_THREADS SESSION_VALUE NULL GLOBAL_VALUE 0 diff --git a/mysql-test/suite/sys_vars/t/replicate_allow_parallel_basic.test b/mysql-test/suite/sys_vars/t/replicate_allow_parallel_basic.test new file mode 100644 index 00000000000..46dcbc7fafb --- /dev/null +++ b/mysql-test/suite/sys_vars/t/replicate_allow_parallel_basic.test @@ -0,0 +1,14 @@ +--source include/not_embedded.inc + +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SELECT @@global.replicate_allow_parallel; + +--error ER_LOCAL_VARIABLE +SET GLOBAL replicate_allow_parallel= 1; +SELECT @@session.replicate_allow_parallel; +SET SESSION replicate_allow_parallel= 0; +SELECT @@session.replicate_allow_parallel; +SET SESSION replicate_allow_parallel= 1; +SELECT @@session.replicate_allow_parallel; + +# More testing of the actual functionality in rpl.rpl_parallel_* tests. diff --git a/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic-master.opt b/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic-master.opt new file mode 100644 index 00000000000..cc40fa4761f --- /dev/null +++ b/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic-master.opt @@ -0,0 +1 @@ +--slave-parallel-mode=domain --m1.slave-parallel-mode=transactional --m2.slave-parallel-mode=domain,follow_master_commit,waiting diff --git a/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic.test b/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic.test new file mode 100644 index 00000000000..7cc2d1f25dc --- /dev/null +++ b/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic.test @@ -0,0 +1,38 @@ +--source include/not_embedded.inc + +# Also tests some command line options, in slave_parallel_mode_basic-master.opt + +--error ER_GLOBAL_VARIABLE +SET SESSION slave_parallel_mode= ''; + +SELECT @@slave_parallel_mode; +--error WARN_NO_MASTER_INFO +SELECT @@m1.slave_parallel_mode; + +CHANGE MASTER TO master_host='127.0.0.1', master_port=3310, master_user='root'; +SELECT @@``.slave_parallel_mode; +SELECT @@slave_parallel_mode; +--let $status_items= Parallel_Mode +--source include/show_slave_status.inc + +--error WARN_NO_MASTER_INFO +SELECT @@m2.slave_parallel_mode; +--error WARN_NO_MASTER_INFO +SET GLOBAL m2.slave_parallel_mode = ''; + +CHANGE MASTER 'm1' TO master_host='127.0.0.1', master_port=3311, master_user='root'; +SELECT @@m1.slave_parallel_mode; +--source include/show_slave_status.inc +SET GLOBAL m1.slave_parallel_mode= follow_master_commit; +--source include/show_slave_status.inc +SET default_master_connection= 'm1'; +SELECT @@slave_parallel_mode; +SET GLOBAL slave_parallel_mode= waiting; +SELECT @@slave_parallel_mode; +--source include/show_slave_status.inc +SET default_master_connection= ''; +SELECT @@slave_parallel_mode; + + +RESET SLAVE ALL; +RESET SLAVE 'm1' ALL; |