- 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 e6e1f982be0fe94bf8c1e6482f1edbeb20cf9578..b30957c5a4e3103d966cb40c827430cddb0eaaf7 100644 (file)
--- 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)) {