diff options
| author | Anatol Belski <ab@php.net> | 2014-10-31 19:53:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-31 19:53:59 +0100 |
| commit | e2305ac27e5130e8ff84df69847780c50ee59f1d (patch) | |
| tree | 46eccac4778a8d4eea40de8f53457a27814b3d84 /ext/pdo_pgsql/pgsql_driver.c | |
| parent | ed9ada5fa124cbdc0fa7d7845ef61b4eb7c31798 (diff) | |
| parent | 1b1f7c627a0b7df1b093b62f7472cb0ea4b9ea96 (diff) | |
| download | php-git-e2305ac27e5130e8ff84df69847780c50ee59f1d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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 b107f922a9..2d45152ad9 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -509,7 +509,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; |