Commit 7da50ff

authored

Transaction Commit/Rollback returns conn's cached error, if present (#1691)

If a transaction connection has a cached error, return it instead of ErrInvalidConn during Commit/Rollback operations. Fix #1690

1 parent e02b809 commit 7da50ffCopy full SHA for 7da50ff

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ Asta Xie <xiemengjun at gmail.com>`
`25`	`25`	`B Lamarche <blam413 at gmail.com>`
`26`	`26`	`Bes Dollma <bdollma@thousandeyes.com>`
`27`	`27`	`Bogdan Constantinescu <bog.con.bc at gmail.com>`
	`28`	`+Brad Higgins <brad at defined.net>`
`28`	`29`	`Brian Hendriks <brian at dolthub.com>`
`29`	`30`	`Bulat Gaifullin <gaifullinbf at gmail.com>`
`30`	`31`	`Caine Jette <jette at alum.mit.edu>`
`@@ -135,6 +136,7 @@ Ziheng Lyu <zihenglv at gmail.com>`
`135`	`136`
`136`	`137`	`Barracuda Networks, Inc.`
`137`	`138`	`Counting Ltd.`
	`139`	`+Defined Networking Inc.`
`138`	`140`	`DigitalOcean Inc.`
`139`	`141`	`Dolthub Inc.`
`140`	`142`	`dyves labs AG`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,18 +13,32 @@ type mysqlTx struct {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`func (tx *mysqlTx) Commit() (err error) {`
`16`		`- if tx.mc == nil \|\|tx.mc.closed.Load() {`
	`16`	`+ if tx.mc == nil {`
`17`	`17`	`return ErrInvalidConn`
`18`	`18`	`}`
	`19`	`+ if tx.mc.closed.Load() {`
	`20`	`+ err = tx.mc.error()`
	`21`	`+ if err == nil {`
	`22`	`+ err = ErrInvalidConn`
	`23`	`+ }`
	`24`	`+ return`
	`25`	`+ }`
`19`	`26`	`err = tx.mc.exec("COMMIT")`
`20`	`27`	`tx.mc = nil`
`21`	`28`	`return`
`22`	`29`	`}`
`23`	`30`
`24`	`31`	`func (tx *mysqlTx) Rollback() (err error) {`
`25`		`- if tx.mc == nil \|\|tx.mc.closed.Load() {`
	`32`	`+ if tx.mc == nil {`
`26`	`33`	`return ErrInvalidConn`
`27`	`34`	`}`
	`35`	`+ if tx.mc.closed.Load() {`
	`36`	`+ err = tx.mc.error()`
	`37`	`+ if err == nil {`
	`38`	`+ err = ErrInvalidConn`
	`39`	`+ }`
	`40`	`+ return`
	`41`	`+ }`
`28`	`42`	`err = tx.mc.exec("ROLLBACK")`
`29`	`43`	`tx.mc = nil`
`30`	`44`	`return`

Comments

(0)