diff options
| author | Andrey Hristov <andrey@php.net> | 2008-07-22 23:44:23 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-07-22 23:44:23 +0000 |
| commit | 8c56a23a2659ee240524d568110133e0e80543dd (patch) | |
| tree | 20f4ec4530e6c5c8d50684a2256ffb047a17928b /ext/mysql | |
| parent | ae8ef6c13abfe97acb7cbcbaa9608fe2cb8fdf23 (diff) | |
| download | php-git-8c56a23a2659ee240524d568110133e0e80543dd.tar.gz | |
MFH: Two less failing tests, one of which was definitely a leak in mysqli with mysqlnd
and pconn. ext/mysql is being fixed with a better fix for similar leak.
Diffstat (limited to 'ext/mysql')
| -rw-r--r-- | ext/mysql/php_mysql.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 6908b294bd..237bdb54e8 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -794,6 +794,9 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) mysql->active_result_id = 0; mysql->multi_query = client_flags & CLIENT_MULTI_STATEMENTS? 1:0; /* ensure that the link did not die */ +#if defined(MYSQL_USE_MYSQLND) + mysqlnd_end_psession(mysql->conn); +#endif if (mysql_ping(mysql->conn)) { if (mysql_errno(mysql->conn) == 2006) { #ifndef MYSQL_USE_MYSQLND |