diff options
| author | Johannes Schlüter <johannes@php.net> | 2009-01-27 15:35:34 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2009-01-27 15:35:34 +0000 |
| commit | 611c45359813e4f9059172870af5c855988f1c20 (patch) | |
| tree | bc5c3b88ef5de36dd4db25f51a6e5758d9edb8d8 | |
| parent | 029f5e651aa6f3b0d9224b6866469745a7e26c8f (diff) | |
| download | php-git-611c45359813e4f9059172870af5c855988f1c20.tar.gz | |
MFH: Fix mysqli pconnects to properly reset connection status by default
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 3d72a0e745..95ddb9e6df 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -177,9 +177,8 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne mysqlnd_end_psession(mysql->mysql); #endif /* reset variables */ - /* todo: option for ping or change_user */ -#if G0 +#ifndef MYSQLI_NO_CHANGE_USER_ON_PCONNECT if (!mysql_change_user(mysql->mysql, username, passwd, dbname)) { #else if (!mysql_ping(mysql->mysql)) { |