Merge branch 'master' into gtid_tagged_log_event_serialized

lance6716 · web-flow · commit dfc7475680fa · 2025-03-03T11:10:50.000+08:00
diff --git a/replication/binlogsyncer.go b/replication/binlogsyncer.go
@@ -319,13 +319,9 @@ func (b *BinlogSyncer) registerSlave() error {
 			// necessary checksummed.
 			// That preference is specified below.
 
-			if _, err = b.c.Execute(`SET @master_binlog_checksum='NONE'`); err != nil {
+			if _, err = b.c.Execute(`SET @master_binlog_checksum='NONE', @source_binlog_checksum='NONE'`); err != nil {
 				return errors.Trace(err)
 			}
-
-			// if _, err = b.c.Execute(`SET @master_binlog_checksum=@@global.binlog_checksum`); err != nil {
-			// 	return errors.Trace(err)
-			// }
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -319,13 +319,9 @@ func (b *BinlogSyncer) registerSlave() error {`
`319`	`319`	`// necessary checksummed.`
`320`	`320`	`// That preference is specified below.`
`321`	`321`
`322`		- if _, err = b.c.Execute(`SET @master_binlog_checksum='NONE'`); err != nil {
	`322`	+ if _, err = b.c.Execute(`SET @master_binlog_checksum='NONE', @source_binlog_checksum='NONE'`); err != nil {
`323`	`323`	`return errors.Trace(err)`
`324`	`324`	`}`
`325`		`-`
`326`		- // if _, err = b.c.Execute(`SET @master_binlog_checksum=@@global.binlog_checksum`); err != nil {
`327`		`- // return errors.Trace(err)`
`328`		`- // }`
`329`	`325`	`}`
`330`	`326`	`}`
`331`	`327`