DadaVinqi commented on PR #1148: URL: https://github.com/apache/incubator-seata-go/pull/1148#issuecomment-5506962862
Conflicts are resolved in 62cde06 by merging the latest `master`. The resolution keeps both sides of the XA hold behavior: - preserve the per-connection `shouldBeHeld` decision from #1148; - retain unknown database types conservatively, as introduced by #1150; - keep both the upstream `TestXAConn_ShouldBeHeld` coverage and the existing ownership/timeout tests. Validation after the merge: - `go test ./pkg/datasource/sql/...` — 1879 passed - focused race tests — 91 passed - `go vet ./pkg/datasource/sql/...` — passed -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
