cvs: php-src(PHP_5_2) /ext/mysql php_mysql.c
| From: | Antony Dovgal | Date: | Thu, 07 Jun 2007 12:17:35 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/mysql php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-44739@lists.php.net to get a copy of this message | ||
tony2001 Thu Jun 7 12:17:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysql php_mysql.c
Log:
MFH: reset active_result_id when fetching persistent connection
patch by Peter Christensen
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.12&r2=1.213.2.6.2.13&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.12 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.13
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.12 Mon May 14 18:09:20 2007
+++ php-src/ext/mysql/php_mysql.c Thu Jun 7 12:17:35 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.12 2007/05/14 18:09:20 scottmac Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.13 2007/06/07 12:17:35 tony2001 Exp $ */
/* TODO:
*
@@ -738,6 +738,7 @@
#endif
mysql = (php_mysql_conn *) le->ptr;
+ mysql->active_result_id = 0;
}
ZEND_REGISTER_RESOURCE(return_value, mysql, le_plink);
} else { /* non persistent */