From 611c45359813e4f9059172870af5c855988f1c20 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Tue, 27 Jan 2009 15:35:34 +0000
Subject: [PATCH] MFH: Fix mysqli pconnects to properly reset connection status
 by default

---
 ext/mysqli/mysqli_nonapi.c | 3 +--
 1 file changed, 1 insertion(+), 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)) {
-- 
2.40.0