Skip to content

fix canal.GetMasterPos() for mariadb #1030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 6, 2025
Merged

fix canal.GetMasterPos() for mariadb #1030

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2abc39
fix canal.GetMasterPos() for mariadb
May 2, 2025
db9a729
add getShowBinaryLogQuery
May 5, 2025
b290e28
add test
May 5, 2025
dcabb57
Merge branch 'go-mysql-org:master' into mariadb-masterpos-fix
alarbada May 5, 2025
c32c655
improve docs
May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions canal/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,12 +325,21 @@ func (c *Canal) WaitUntilPos(pos mysql.Position, timeout time.Duration) error {
}

func (c *Canal) GetMasterPos() (mysql.Position, error) {
showBinlogStatus := "SHOW BINARY LOG STATUS"
if eq, err := c.conn.CompareServerVersion("8.4.0"); (err == nil) && (eq < 0) {
showBinlogStatus = "SHOW MASTER STATUS"
query := "SHOW BINARY LOG STATUS"
switch c.cfg.Flavor {
case mysql.MariaDBFlavor:
query = "SHOW BINLOG STATUS"

if eq, err := c.conn.CompareServerVersion("10.5.2"); (err == nil) && (eq < 0) {
query = "SHOW MASTER STATUS"
}
case mysql.MySQLFlavor:
if eq, err := c.conn.CompareServerVersion("8.4.0"); (err == nil) && (eq < 0) {
query = "SHOW MASTER STATUS"
}
}

rr, err := c.Execute(showBinlogStatus)
rr, err := c.Execute(query)
if err != nil {
return mysql.Position{}, errors.Trace(err)
}
Expand Down