Commit e954bf6

committed

Merge branch 'PHP-8.4'

* PHP-8.4: Fixed pdo_firebird_handle_factory to check ret when starting a transaction (#17632)

2 parents a2ac800 + e96a35b commit e954bf6Copy full SHA for e954bf6

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;`
`@@ -1422,7 +1422,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t dbh, zval driver_options) /*`
`1422`	`1422`	`"HY000", H->isc_status[1], errmsg);`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`		`- if (dbh->auto_commit && !H->tr) {`
	`1425`	`+ if (ret&&dbh->auto_commit && !H->tr) {`
`1426`	`1426`	`ret = php_firebird_begin_transaction(dbh, /* auto commit mode */ true);`
`1427`	`1427`	`}`
`1428`	`1428`

Comments

(0)