From: Nikita Popov <nikic@php.net>
Date: Tue, 3 Jan 2017 11:18:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=661fad7beb71d1096e93b0212624ad5f94e5a648;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

661fad7beb71d1096e93b0212624ad5f94e5a648
diff --cc NEWS
index c1fbefa669,26376b694d..80e91c4dd1
--- a/NEWS
+++ b/NEWS
@@@ -24,13 -17,13 +24,17 @@@ PH
  - DOM:
    . Fixed bug #67474 (getElementsByTagNameNS filter on default ns). (aboks)
  
 +- Mbstring:
 +  . Fixed bug #73646 (mb_ereg_search_init null pointer dereference).
 +    (Laruence)
 +
+ - Mysqli:
+   . Fixed bug #73462 (Persistent connections don't set $connect_errno).
+     (darkain)
+ 
  - Mysqlnd:
 -  . Fixed issue with decoding BIT columns when having more than one rows in the
 -    result set. 7.0+ problem. (Andrey)
 +  . Optimized handling of BIT fields - less memory copies and lower memory
 +    usage. (Andrey)
    . Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE). 
  	(vanviegen)