johannes Tue Jan 27 15:35:35 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_nonapi.c
Log:
MFH: Fix mysqli pconnects to properly reset connection status by default
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.20&r2=1.54.2.7.2.5.2.21&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.20
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.21
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.20 Wed Dec 31
11:15:39 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Jan 27 15:35:34 2009
@@ -17,7 +17,7 @@
| Ulf Wendel <u...@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.20 2008/12/31 11:15:39 sebastian Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.21 2009/01/27 15:35:34 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -177,9 +177,8 @@
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)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
