percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-20 02:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: forgot to inherit conflicts

Browse Source
This commit is contained in:
Yoann La Cancellera
2023-09-01 16:56:54 +02:00
parent b054429057
commit e03fe1801c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/go/pt-galera-log-explainer/types/ctx.go
View File

@@ -230,6 +230,7 @@ func (base *LogCtx) Inherit(ctx LogCtx) {
if base.Version == "" { if base.Version == "" {
base.Version = ctx.Version base.Version = ctx.Version
} }
base.Conflicts = append(ctx.Conflicts, base.Conflicts...)
base.MergeMapsWith([]LogCtx{ctx}) base.MergeMapsWith([]LogCtx{ctx})
} }