Merge remote-tracking branch 'apache/master' into rename-module3

apache · Mar 16, 2024 · 7e76415 · 7e76415
2 parents 5d36fb7 + 72ca442
commit 7e76415
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pkg/datasource/sql/conn_xa.go b/pkg/datasource/sql/conn_xa.go
@@ -102,7 +102,11 @@ func (c *XAConn) ExecContext(ctx context.Context, query string, args []driver.Na
 		return types.NewResult(types.WithResult(ret)), nil
 	})
 
-	return ret.GetResult(), err
+	if err != nil {
+		return nil, err
+	}
+
+	return ret.GetResult(), nil
 }
 
 // BeginTx like common transaction. but it just exec XA START
@@ -257,11 +261,11 @@ func (c *XAConn) start(ctx context.Context) error {
 }
 
 func (c *XAConn) end(ctx context.Context, flags int) error {
-	err := c.termination(c.xaBranchXid.String())
+	err := c.xaResource.End(ctx, c.xaBranchXid.String(), flags)
 	if err != nil {
 		return err
 	}
-	err = c.xaResource.End(ctx, c.xaBranchXid.String(), flags)
+	err = c.termination(c.xaBranchXid.String())
 	if err != nil {
 		return err
 	}