johannes                Mon Aug 11 12:33:56 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/mysqli mysqli_nonapi.c 
    /php-src    NEWS 
  Log:
  MFH: Fix #45763 (mysqli::multi_query does not work with mysqlnd)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.14&r2=1.54.2.7.2.5.2.15&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.14 
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.15
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.14        Tue Jul 22 
23:44:23 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c  Mon Aug 11 12:33:55 2008
@@ -17,7 +17,7 @@
   |          Ulf Wendel <[EMAIL PROTECTED]>                                    
 |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.14 2008/07/22 23:44:23 andrey Exp $ 
+  $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.15 2008/08/11 12:33:55 johannes Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -271,11 +271,7 @@
 
        MyG(num_links)++;
 
-#if !defined(MYSQLI_USE_MYSQLND)
        mysql->multi_query = 0;
-#else
-       mysql->multi_query = 1;
-#endif
 
        if (!object || !instanceof_function(Z_OBJCE_P(object), 
mysqli_link_class_entry TSRMLS_CC)) {
                MYSQLI_RETURN_RESOURCE(mysqli_resource, 
mysqli_link_class_entry);       
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.262&r2=1.2027.2.547.2.965.2.263&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.262 
php-src/NEWS:1.2027.2.547.2.965.2.263
--- php-src/NEWS:1.2027.2.547.2.965.2.262       Sun Aug 10 22:02:05 2008
+++ php-src/NEWS        Mon Aug 11 12:33:56 2008
@@ -13,6 +13,7 @@
 - Fixed a bug causing miscalculations with the "last <weekday> of <n> month"
   relative time string. (Derick)
 
+- Fixed bug #45763 (mysqli::multi_query does not work with mysqlnd). (Johannes)
 - Fixed bug #45757 (FreeBSD4.11 build failure: failed include; stdint.h).
   (Hannes)
 - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h).



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to