diff options
| author | Anatol Belski <ab@php.net> | 2014-10-31 19:53:39 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-31 19:53:39 +0100 |
| commit | 1b1f7c627a0b7df1b093b62f7472cb0ea4b9ea96 (patch) | |
| tree | 2a3aebb8da55794a9a41f42e191c7348d8ed6d81 /ext/pdo_pgsql/pgsql_driver.c | |
| parent | e797db890913924ae1d344c3bbd985169c42a87a (diff) | |
| parent | 1fc80d0ca7f4fbf826d11dbcaa1b3cd79e8351a0 (diff) | |
| download | php-git-1b1f7c627a0b7df1b093b62f7472cb0ea4b9ea96.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix ZTS build
Diffstat (limited to 'ext/pdo_pgsql/pgsql_driver.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 4d07780e28..f347aaa0e4 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -503,7 +503,7 @@ static int pgsql_handle_commit(pdo_dbh_t *dbh TSRMLS_DC) /* When deferred constraints are used the commit could fail, and a ROLLBACK implicitly ran. See bug #67462 */ if (!ret) { - dbh->in_txn = pgsql_handle_in_transaction(dbh); + dbh->in_txn = pgsql_handle_in_transaction(dbh TSRMLS_CC); } return ret; |