Skip to content

M
MariaDB
Commit 6f22a9be authored by Andrei's avatar Andrei
Browse files
Options

MDEV-33924 Gtid_log_event thread_id missing in binlog when .. 

.. pseudo_thread_id is set to 0 or negative.

This commit carries affected tests and test results due to
Gtid_log_event::thread_id 32-bit enforcement by a previous commit.
parent bcc579bc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 282 additions and 280 deletions
mysql-test/main/mysqlbinlog_row_compressed.test
View file @ 6f22a9be
...@@ -30,7 +30,7 @@ DELETE FROM t2; ...@@ -30,7 +30,7 @@ DELETE FROM t2;
FLUSH BINARY LOGS; FLUSH BINARY LOGS;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/ --replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/ /end_log_pos [0-9]*/end_log_pos #/
--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
--echo --echo
......
mysql-test/main/mysqlbinlog_row_minimal.test
View file @ 6f22a9be
...@@ -28,7 +28,7 @@ DELETE FROM t2; ...@@ -28,7 +28,7 @@ DELETE FROM t2;
FLUSH BINARY LOGS; FLUSH BINARY LOGS;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/ --replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/
--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
DROP TABLE t1,t2; DROP TABLE t1,t2;
......
mysql-test/main/mysqlbinlog_stmt_compressed.result
View file @ 6f22a9be
...@@ -16,20 +16,20 @@ FLUSH BINARY LOGS; ...@@ -16,20 +16,20 @@ FLUSH BINARY LOGS;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/; DELIMITER /*!*/;
# at 4 # at 4
#<date> server id 1 end_log_pos 256 CRC32 XXX Start: xxx #<date> server id 1 end_log_pos # CRC32 XXX Start: xxx
ROLLBACK/*!*/; ROLLBACK/*!*/;
# at 256 # at 256
#<date> server id 1 end_log_pos 285 CRC32 XXX Gtid list [] #<date> server id 1 end_log_pos # CRC32 XXX Gtid list []
# at 285 # at 285
#<date> server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001 #<date> server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
# at 329 # at 329
#<date> server id 1 end_log_pos 374 CRC32 XXX GTID 0-1-1 ddl thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl thread_id=TID
/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; /*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
/*!100001 SET @@session.gtid_domain_id=0*//*!*/; /*!100001 SET @@session.gtid_domain_id=0*//*!*/;
/*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/;
/*!100001 SET @@session.gtid_seq_no=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at 374 # at 371
#<date> server id 1 end_log_pos 545 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
SET @@session.pseudo_thread_id=TID/*!*/; SET @@session.pseudo_thread_id=TID/*!*/;
...@@ -42,136 +42,136 @@ SET @@session.lc_time_names=0/*!*/; ...@@ -42,136 +42,136 @@ SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/; SET @@session.collation_database=DEFAULT/*!*/;
CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1)) CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1))
/*!*/; /*!*/;
# at 545 # at 542
#<date> server id 1 end_log_pos 590 CRC32 XXX GTID 0-1-2 ddl thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 ddl thread_id=TID
/*!100001 SET @@session.gtid_seq_no=2*//*!*/; /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
# at 590 # at 584
#<date> server id 1 end_log_pos 751 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1)) CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1))
/*!*/; /*!*/;
# at 751 # at 745
#<date> server id 1 end_log_pos 796 CRC32 XXX GTID 0-1-3 thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 thread_id=TID
/*!100001 SET @@session.gtid_seq_no=3*//*!*/; /*!100001 SET @@session.gtid_seq_no=3*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 796 # at 787
#<date> server id 1 end_log_pos 0 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "") INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "")
/*!*/; /*!*/;
# at 924 # at 915
#<date> server id 1 end_log_pos 997 CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 997 # at 988
#<date> server id 1 end_log_pos 1042 CRC32 XXX GTID 0-1-4 thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 thread_id=TID
/*!100001 SET @@session.gtid_seq_no=4*//*!*/; /*!100001 SET @@session.gtid_seq_no=4*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1042 # at 1030
#<date> server id 1 end_log_pos 0 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL) INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL)
/*!*/; /*!*/;
# at 1170 # at 1158
#<date> server id 1 end_log_pos 1243 CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1243 # at 1231
#<date> server id 1 end_log_pos 1288 CRC32 XXX GTID 0-1-5 thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 thread_id=TID
/*!100001 SET @@session.gtid_seq_no=5*//*!*/; /*!100001 SET @@session.gtid_seq_no=5*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1288 # at 1273
#<date> server id 1 end_log_pos 0 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A") INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A")
/*!*/; /*!*/;
# at 1418 # at 1403
#<date> server id 1 end_log_pos 1491 CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1491 # at 1476
#<date> server id 1 end_log_pos 1536 CRC32 XXX GTID 0-1-6 thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 thread_id=TID
/*!100001 SET @@session.gtid_seq_no=6*//*!*/; /*!100001 SET @@session.gtid_seq_no=6*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1536 # at 1518
#<date> server id 1 end_log_pos 0 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A") INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A")
/*!*/; /*!*/;
# at 1663 # at 1645
#<date> server id 1 end_log_pos 1736 CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1736 # at 1718
#<date> server id 1 end_log_pos 1781 CRC32 XXX GTID 0-1-7 thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 thread_id=TID
/*!100001 SET @@session.gtid_seq_no=7*//*!*/; /*!100001 SET @@session.gtid_seq_no=7*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1781 # at 1760
#<date> server id 1 end_log_pos 0 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t2 SELECT * FROM t1 INSERT INTO t2 SELECT * FROM t1
/*!*/; /*!*/;
# at 1889 # at 1868
#<date> server id 1 end_log_pos 1962 CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1962 # at 1941
#<date> server id 1 end_log_pos 2007 CRC32 XXX GTID 0-1-8 thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 thread_id=TID
/*!100001 SET @@session.gtid_seq_no=8*//*!*/; /*!100001 SET @@session.gtid_seq_no=8*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2007 # at 1983
#<date> server id 1 end_log_pos 0 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL
/*!*/; /*!*/;
# at 2124 # at 2100
#<date> server id 1 end_log_pos 2197 CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2197 # at 2173
#<date> server id 1 end_log_pos 2242 CRC32 XXX GTID 0-1-9 thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-9 thread_id=TID
/*!100001 SET @@session.gtid_seq_no=9*//*!*/; /*!100001 SET @@session.gtid_seq_no=9*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2242 # at 2215
#<date> server id 1 end_log_pos 0 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
DELETE FROM t1 DELETE FROM t1
/*!*/; /*!*/;
# at 2333 # at 2306
#<date> server id 1 end_log_pos 2406 CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2406 # at 2379
#<date> server id 1 end_log_pos 2451 CRC32 XXX GTID 0-1-10 thread_id=TID #<date> server id 1 end_log_pos # CRC32 XXX GTID 0-1-10 thread_id=TID
/*!100001 SET @@session.gtid_seq_no=10*//*!*/; /*!100001 SET @@session.gtid_seq_no=10*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2451 # at 2421
#<date> server id 1 end_log_pos 0 CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query_compressed thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
DELETE FROM t2 DELETE FROM t2
/*!*/; /*!*/;
# at 2542 # at 2512
#<date> server id 1 end_log_pos 2615 CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> #<date> server id 1 end_log_pos # CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid>
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2615 # at 2585
#<date> server id 1 end_log_pos 2663 CRC32 XXX Rotate to master-bin.000002 pos: 4 #<date> server id 1 end_log_pos # CRC32 XXX Rotate to master-bin.000002 pos: 4
DELIMITER ; DELIMITER ;
# End of log file # End of log file
ROLLBACK /* added by mysqlbinlog */; ROLLBACK /* added by mysqlbinlog */;
......
mysql-test/main/mysqlbinlog_stmt_compressed.test
View file @ 6f22a9be
...@@ -29,7 +29,7 @@ DELETE FROM t2; ...@@ -29,7 +29,7 @@ DELETE FROM t2;
FLUSH BINARY LOGS; FLUSH BINARY LOGS;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/ --replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /thread_id=\d*/thread_id=TID/ /end_log_pos [0-9]*/end_log_pos #/
--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
--echo --echo
......
mysql-test/main/mysqldump-max.test
View file @ 6f22a9be
...@@ -1194,7 +1194,7 @@ source include/binlog_start_pos.inc; ...@@ -1194,7 +1194,7 @@ source include/binlog_start_pos.inc;
let _BINLOG_START_POS= $binlog_start_pos; let _BINLOG_START_POS= $binlog_start_pos;
--perl --perl
my $f= "$ENV{MYSQLTEST_VARDIR}/tmp/mwl136.sql"; my $f= "$ENV{MYSQLTEST_VARDIR}/tmp/mwl136.sql";
my $pos=$ENV{_BINLOG_START_POS} + 769; my $pos=$ENV{_BINLOG_START_POS} + 757;
open F, '<', $f or die "Failed to open $f: $!\n"; open F, '<', $f or die "Failed to open $f: $!\n";
while (<F>) { while (<F>) {
s/$pos/<pos>/; s/$pos/<pos>/;
......
mysql-test/suite/binlog/r/max_binlog_total_size.result
View file @ 6f22a9be
...@@ -37,7 +37,7 @@ KEY `v1` (`v1`) ...@@ -37,7 +37,7 @@ KEY `v1` (`v1`)
INSERT INTO t1 VALUES (0,repeat("a",3000)); INSERT INTO t1 VALUES (0,repeat("a",3000));
show status like "binlog_disk_use"; show status like "binlog_disk_use";
Variable_name Value Variable_name Value
Binlog_disk_use 3869 Binlog_disk_use 3863
# First binary should be binary.000004 # First binary should be binary.000004
show binary logs; show binary logs;
Log_name File_size Log_name File_size
...@@ -98,7 +98,7 @@ Log_name File_size ...@@ -98,7 +98,7 @@ Log_name File_size
binary.000002 # binary.000002 #
show status like "binlog_disk_use"; show status like "binlog_disk_use";
Variable_name Value Variable_name Value
Binlog_disk_use 3650 Binlog_disk_use 3647
INSERT INTO t1 VALUES (7,repeat("g",3000)); INSERT INTO t1 VALUES (7,repeat("g",3000));
# binary.000001 should be deleted now # binary.000001 should be deleted now
show binary logs; show binary logs;
...@@ -107,7 +107,7 @@ binary.000002 # ...@@ -107,7 +107,7 @@ binary.000002 #
binary.000003 # binary.000003 #
show status like "binlog_disk_use"; show status like "binlog_disk_use";
Variable_name Value Variable_name Value
Binlog_disk_use 7344 Binlog_disk_use 7338
FLUSH LOGS; FLUSH LOGS;
FLUSH LOGS; FLUSH LOGS;
# binary.000002 should be deleted now # binary.000002 should be deleted now
......
mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
View file @ 6f22a9be
...@@ -58,20 +58,20 @@ select "--- offset --" as ""; ...@@ -58,20 +58,20 @@ select "--- offset --" as "";
--disable_query_log --disable_query_log
select "--- start-position --" as ""; select "--- start-position --" as "";
--enable_query_log --enable_query_log
let $start_pos= `select @binlog_start_pos + 714`; let $start_pos= `select @binlog_start_pos + 705`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001
--disable_query_log --disable_query_log
select "--- stop-position --" as ""; select "--- stop-position --" as "";
--enable_query_log --enable_query_log
let $stop_pos= `select @binlog_start_pos + 714`; let $stop_pos= `select @binlog_start_pos + 705`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 --exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001
--disable_query_log --disable_query_log
select "--- start and stop positions ---" as ""; select "--- start and stop positions ---" as "";
--enable_query_log --enable_query_log
let $start_pos= `select @binlog_start_pos + 714`; let $start_pos= `select @binlog_start_pos + 705`;
let $stop_pos= `select @binlog_start_pos + 878`; let $stop_pos= `select @binlog_start_pos + 866`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001
--disable_query_log --disable_query_log
...@@ -103,13 +103,13 @@ select "--- offset --" as ""; ...@@ -103,13 +103,13 @@ select "--- offset --" as "";
--disable_query_log --disable_query_log
select "--- start-position --" as ""; select "--- start-position --" as "";
--enable_query_log --enable_query_log
let $start_pos= `select @binlog_start_pos + 714`; let $start_pos= `select @binlog_start_pos + 705`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
--disable_query_log --disable_query_log
select "--- stop-position --" as ""; select "--- stop-position --" as "";
--enable_query_log --enable_query_log
let $stop_pos= `select @binlog_start_pos + 134 + 1*3`; let $stop_pos= `select @binlog_start_pos + 134`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
--disable_query_log --disable_query_log
...@@ -138,20 +138,20 @@ select "--- offset --" as ""; ...@@ -138,20 +138,20 @@ select "--- offset --" as "";
--disable_query_log --disable_query_log
select "--- start-position --" as ""; select "--- start-position --" as "";
--enable_query_log --enable_query_log
let $start_pos= `select @binlog_start_pos + 714`; let $start_pos= `select @binlog_start_pos + 705`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
--disable_query_log --disable_query_log
select "--- stop-position --" as ""; select "--- stop-position --" as "";
--enable_query_log --enable_query_log
let $stop_pos= `select @binlog_start_pos + 714`; let $stop_pos= `select @binlog_start_pos + 705`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
--disable_query_log --disable_query_log
select "--- start and stop positions ---" as ""; select "--- start and stop positions ---" as "";
--enable_query_log --enable_query_log
let $start_pos= `select @binlog_start_pos + 714`; let $start_pos= `select @binlog_start_pos + 705`;
let $stop_pos= `select @binlog_start_pos + 878`; let $stop_pos= `select @binlog_start_pos + 812`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position $stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position $stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
--disable_query_log --disable_query_log
...@@ -180,13 +180,13 @@ select "--- offset --" as ""; ...@@ -180,13 +180,13 @@ select "--- offset --" as "";
--disable_query_log --disable_query_log
select "--- start-position --" as ""; select "--- start-position --" as "";
--enable_query_log --enable_query_log
let $start_pos= `select @binlog_start_pos + 714`; let $start_pos= `select @binlog_start_pos + 705`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
--disable_query_log --disable_query_log
select "--- stop-position --" as ""; select "--- stop-position --" as "";
--enable_query_log --enable_query_log
let $stop_pos= `select @binlog_start_pos + 109 + 1*3`; let $stop_pos= `select @binlog_start_pos + 109`;
--replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ --replace_regex /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/
--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
--disable_query_log --disable_query_log
......
mysql-test/suite/galera_sr/r/MDEV-18585.result
View file @ 6f22a9be
...@@ -12,7 +12,7 @@ SET SESSION wsrep_trx_fragment_size=1; ...@@ -12,7 +12,7 @@ SET SESSION wsrep_trx_fragment_size=1;
INSERT INTO t1 VALUES (5), (6); INSERT INTO t1 VALUES (5), (6);
SET SESSION wsrep_trx_fragment_unit=default; SET SESSION wsrep_trx_fragment_unit=default;
SET SESSION wsrep_trx_fragment_size=default; SET SESSION wsrep_trx_fragment_size=default;
SHOW BINLOG EVENTS IN 'mysqld-bin.000002' FROM 530; SHOW BINLOG EVENTS IN 'mysqld-bin.000002' FROM 527;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
mysqld-bin.000002 # Gtid 1 # BEGIN GTID 0-1-2 mysqld-bin.000002 # Gtid 1 # BEGIN GTID 0-1-2
mysqld-bin.000002 # Annotate_rows 1 # INSERT INTO t1 VALUES (1), (2) mysqld-bin.000002 # Annotate_rows 1 # INSERT INTO t1 VALUES (1), (2)
......
mysql-test/suite/innodb/t/binlog_consistent.test
View file @ 6f22a9be
...@@ -19,7 +19,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb; ...@@ -19,7 +19,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb;
# MDEV-515 takes X-lock on the table for the first insert. # MDEV-515 takes X-lock on the table for the first insert.
# So concurrent insert won't happen on the table # So concurrent insert won't happen on the table
INSERT INTO t1 VALUES(9, ""); INSERT INTO t1 VALUES(9, "");
let pos=`select $binlog_start_pos + 437`; let pos=`select $binlog_start_pos + 431`;
--replace_result $pos <pos> --replace_result $pos <pos>
SHOW MASTER STATUS; SHOW MASTER STATUS;
--replace_result $pos <pos> --replace_result $pos <pos>
...@@ -56,10 +56,10 @@ COMMIT; ...@@ -56,10 +56,10 @@ COMMIT;
connection default; connection default;
SELECT * FROM t1 ORDER BY a,b; SELECT * FROM t1 ORDER BY a,b;
let pos=`select $binlog_start_pos + 989`; let pos=`select $binlog_start_pos + 974`;
--replace_result $pos <pos> --replace_result $pos <pos>
SHOW STATUS LIKE 'binlog_snapshot_%'; SHOW STATUS LIKE 'binlog_snapshot_%';
let pos=`select $binlog_start_pos + 1371`; let pos=`select $binlog_start_pos + 1350`;
--replace_result $pos <pos> --replace_result $pos <pos>
SHOW MASTER STATUS; SHOW MASTER STATUS;
SELECT * FROM t2 ORDER BY a; SELECT * FROM t2 ORDER BY a;
...@@ -77,7 +77,7 @@ FLUSH LOGS; ...@@ -77,7 +77,7 @@ FLUSH LOGS;
connection default; connection default;
SELECT * FROM t1 ORDER BY a,b; SELECT * FROM t1 ORDER BY a,b;
let pos=`select $binlog_start_pos + 989`; let pos=`select $binlog_start_pos + 974`;
--replace_result $pos <pos> --replace_result $pos <pos>
SHOW STATUS LIKE 'binlog_snapshot_%'; SHOW STATUS LIKE 'binlog_snapshot_%';
let pos=`select $binlog_start_pos + 131`; let pos=`select $binlog_start_pos + 131`;
......
mysql-test/suite/innodb/t/group_commit_binlog_pos.test
View file @ 6f22a9be
...@@ -97,7 +97,8 @@ SELECT * FROM t1 ORDER BY a; ...@@ -97,7 +97,8 @@ SELECT * FROM t1 ORDER BY a;
# for the end of the second transaction (as can be checked with # for the end of the second transaction (as can be checked with
# mysqlbinlog). # mysqlbinlog).
let $MYSQLD_DATADIR= `SELECT @@datadir`; let $MYSQLD_DATADIR= `SELECT @@datadir`;
let pos=`select $binlog_start_pos + 763`; # GTID thread_id increased the event size by 2*(1+4)
let pos=`select $binlog_start_pos + 739 + 2*(1+4)`;
--replace_result $pos <pos> --replace_result $pos <pos>
--exec sed -ne 's/.*\(InnoDB: Last binlog file .* position.*\)/\1/p' $MYSQLD_DATADIR/../../log/mysqld.1.err | tail -1 --exec sed -ne 's/.*\(InnoDB: Last binlog file .* position.*\)/\1/p' $MYSQLD_DATADIR/../../log/mysqld.1.err | tail -1
......
mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test
View file @ 6f22a9be
...@@ -98,7 +98,8 @@ SELECT * FROM t1 ORDER BY a; ...@@ -98,7 +98,8 @@ SELECT * FROM t1 ORDER BY a;
# for the end of the second transaction (as can be checked with # for the end of the second transaction (as can be checked with
# mysqlbinlog). # mysqlbinlog).
let $MYSQLD_DATADIR= `SELECT @@datadir`; let $MYSQLD_DATADIR= `SELECT @@datadir`;
let pos=`select $binlog_start_pos + 763`; # GTID thread_id increased the event size by 2*(1+4)
let pos=`select $binlog_start_pos + 739 + 2*(1+4)`;
--replace_result $pos <pos> --replace_result $pos <pos>
--exec sed -ne 's/.*\(InnoDB: Last binlog file .* position.*\)/\1/p' $MYSQLD_DATADIR/../../log/mysqld.1.err | tail -1 --exec sed -ne 's/.*\(InnoDB: Last binlog file .* position.*\)/\1/p' $MYSQLD_DATADIR/../../log/mysqld.1.err | tail -1
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
......
mysql-test/suite/multi_source/multisource_for_channel.result
View file @ 6f22a9be
...@@ -252,7 +252,7 @@ Slave_running ON ...@@ -252,7 +252,7 @@ Slave_running ON
SHOW RELAYLOG EVENTS for channel 'master1'; SHOW RELAYLOG EVENTS for channel 'master1';
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
mysqld-relay-bin-master1.000003 4 Format_desc 3 256 Server ver: Version mysqld-relay-bin-master1.000003 4 Format_desc 3 256 Server ver: Version
mysqld-relay-bin-master1.000003 256 Rotate 1 1373 master-bin.000002;pos=4 mysqld-relay-bin-master1.000003 256 Rotate 1 1358 master-bin.000002;pos=4
mysqld-relay-bin-master1.000003 304 Rotate 3 366 mysqld-relay-bin-master1.000004;pos=4 mysqld-relay-bin-master1.000003 304 Rotate 3 366 mysqld-relay-bin-master1.000004;pos=4
show slave status for channel 'master1' show slave status for channel 'master1'
......
mysql-test/suite/multi_source/reset_slave.test
View file @ 6f22a9be
...@@ -39,9 +39,9 @@ stop slave 'master1'; ...@@ -39,9 +39,9 @@ stop slave 'master1';
--let $datadir = `SELECT @@datadir` --let $datadir = `SELECT @@datadir`
let read_master_log_pos=`select $binlog_start_pos + 617`; let read_master_log_pos=`select $binlog_start_pos + 608`;
let relay_log_pos=`select 2*$binlog_start_pos + 661`; let relay_log_pos=`select 2*$binlog_start_pos + 652`;
let relay_log_space=`select 3*$binlog_start_pos + 723`; let relay_log_space=`select 3*$binlog_start_pos + 714`;
--replace_result $SERVER_MYPORT_1 MYPORT_1 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space <relay_log_space> --replace_result $SERVER_MYPORT_1 MYPORT_1 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space <relay_log_space>
show slave 'master1' status; show slave 'master1' status;
......
mysql-test/suite/rpl/t/rpl_parallel_optimistic_until.test
View file @ 6f22a9be
...@@ -430,7 +430,7 @@ START SLAVE IO_THREAD; ...@@ -430,7 +430,7 @@ START SLAVE IO_THREAD;
--let $pos_until= 3130 --let $pos_until= 3130
--let $file_rl= slave-relay-bin.000018 --let $file_rl= slave-relay-bin.000018
--let $pos_gtid = 2993 --let $pos_gtid = 2987
--let $info= query_get_value(SHOW RELAYLOG EVENTS IN '$file_rl' FROM $pos_gtid LIMIT 1, Info, 1) --let $info= query_get_value(SHOW RELAYLOG EVENTS IN '$file_rl' FROM $pos_gtid LIMIT 1, Info, 1)
if (`SELECT "$info" != "BEGIN GTID 0-1-23"`) if (`SELECT "$info" != "BEGIN GTID 0-1-23"`)
...@@ -438,7 +438,7 @@ if (`SELECT "$info" != "BEGIN GTID 0-1-23"`) ...@@ -438,7 +438,7 @@ if (`SELECT "$info" != "BEGIN GTID 0-1-23"`)
--echo *** Unexpected offset. Refine it to point to the correct GTID! --echo *** Unexpected offset. Refine it to point to the correct GTID!
--die --die
} }
--let $pos_event = 3129 --let $pos_event = 3120
--let $type= query_get_value(SHOW RELAYLOG EVENTS IN '$file_rl' FROM $pos_event LIMIT 1, Event_type, 1) --let $type= query_get_value(SHOW RELAYLOG EVENTS IN '$file_rl' FROM $pos_event LIMIT 1, Event_type, 1)
if (`SELECT "$type" != "Delete_rows_v1"`) if (`SELECT "$type" != "Delete_rows_v1"`)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7