From: Johannes Schlüter <johannes@php.net>
Date: Tue, 27 Jan 2009 15:35:34 +0000 (+0000)
Subject: MFH: Fix mysqli pconnects to properly reset connection status by default
X-Git-Tag: php-5.3.0beta1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=611c45359813e4f9059172870af5c855988f1c20;p=php

MFH: Fix mysqli pconnects to properly reset connection status by default
---

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)) {