diff options
| author | Andrey Hristov <andrey@php.net> | 2014-01-29 15:27:43 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-01-29 15:27:43 +0200 |
| commit | 7807d7d0ce4cbb2c10e7b9d9ae6d9a86a9c43d12 (patch) | |
| tree | 31d6ff1b093420139b44617ca967baad24f33a75 /ext/mysqli/mysqli_api.c | |
| parent | 79ab514f0c114d572b6afc1d5b2decd2d512f19e (diff) | |
| download | php-git-7807d7d0ce4cbb2c10e7b9d9ae6d9a86a9c43d12.tar.gz | |
Add new INI for rollbacking connections put back into the pconn pool
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 9028401595..d6f274b569 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -599,10 +599,20 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status TSRM #if defined(MYSQLI_USE_MYSQLND) mysqlnd_end_psession(mysql->mysql); #endif - zend_ptr_stack_push(&plist->free_links, mysql->mysql); + if (MyG(rollback_on_cached_plink) && +#if !defined(MYSQLI_USE_MYSQLND) + mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, TRANS_COR_NO_OPT, NULL)) +#else + FAIL == mysqlnd_rollback(mysql->mysql, TRANS_COR_NO_OPT, NULL)) +#endif + { + mysqli_close(mysql->mysql, close_type); + } else { + zend_ptr_stack_push(&plist->free_links, mysql->mysql); + MyG(num_inactive_persistent)++; + } MyG(num_active_persistent)--; - MyG(num_inactive_persistent)++; } } mysql->persistent = FALSE; |