Commit e96a35b

committed

Fixed pdo_firebird_handle_factory to check ret when starting a transaction (#17632)

Changed to not execute php_firebird_begin_transaction if transaction cannot be started successfully Closes #17632

1 parent 6717947 commit e96a35bCopy full SHA for e96a35b

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ static bool firebird_handle_preparer(pdo_dbh_t dbh, zend_string sql, /* {{{ */`
`684`	`684`
`685`	`685`	`/* make all parameters nullable */`
`686`	`686`	`unsigned int i;`
`687`		`- XSQLVAR* var;`
	`687`	`+ XSQLVAR* var;`
`688`	`688`	`for (i = 0, var = S->in_sqlda->sqlvar; i < S->in_sqlda->sqld; i++, var++) {`
`689`	`689`	`/* The low bit of sqltype indicates that the parameter can take a NULL value */`
`690`	`690`	`var->sqltype \|= 1;`
`@@ -1431,7 +1431,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t dbh, zval driver_options) /*`
`1431`	`1431`	`"HY000", H->isc_status[1], errmsg);`
`1432`	`1432`	`}`
`1433`	`1433`
`1434`		`- if (dbh->auto_commit && !H->tr) {`
	`1434`	`+ if (ret&&dbh->auto_commit && !H->tr) {`
`1435`	`1435`	`ret = php_firebird_begin_transaction(dbh, /* auto commit mode */ true);`
`1436`	`1436`	`}`
`1437`	`1437`

Comments

(0)