Skip to content

Commit e954bf6

Browse files
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 e954bf6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/pdo_firebird/firebird_driver.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ static bool firebird_handle_preparer(pdo_dbh_t *dbh, zend_string *sql, /* {{{ */
684684

685685
/* make all parameters nullable */
686686
unsigned int i;
687-
XSQLVAR* var;
687+
XSQLVAR* var;
688688
for (i = 0, var = S->in_sqlda->sqlvar; i < S->in_sqlda->sqld; i++, var++) {
689689
/* The low bit of sqltype indicates that the parameter can take a NULL value */
690690
var->sqltype |= 1;
@@ -1422,7 +1422,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /*
14221422
"HY000", H->isc_status[1], errmsg);
14231423
}
14241424

1425-
if (dbh->auto_commit && !H->tr) {
1425+
if (ret && dbh->auto_commit && !H->tr) {
14261426
ret = php_firebird_begin_transaction(dbh, /* auto commit mode */ true);
14271427
}
14281428

0 commit comments

Comments
 (0)