diff options
| author | Johannes Schlüter <johannes@php.net> | 2009-01-27 15:35:22 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2009-01-27 15:35:22 +0000 |
| commit | 6e24169120ea2337c84a7b0f4b062ac0997e3973 (patch) | |
| tree | add89dc72b761fd47c574c7259dbfa35e671ab0c | |
| parent | 0e1277e317ea9012d79fdb7d7f4303d505430411 (diff) | |
| download | php-git-6e24169120ea2337c84a7b0f4b062ac0997e3973.tar.gz | |
- 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 e6e1f982be..b30957c5a4 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -173,9 +173,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)) { |