From: Keyur Govande <keyur@php.net>
Date: Mon, 26 Jan 2015 21:32:32 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.6RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=168877bc78376fe7c0e3130c5305c66d2865eb38;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add NEWS
  Patch commit d9f85373e32 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).

Conflicts:
	ext/mysqlnd/config9.m4
---

168877bc78376fe7c0e3130c5305c66d2865eb38
diff --cc NEWS
index 01621236eb,2a25af0775..cec955c572
--- a/NEWS
+++ b/NEWS
@@@ -28,7 -25,13 +28,13 @@@
    . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong 
      required_num_args). (Julien)
  
+ - Mysqli:
+   . Fixed bug #68114 (linker error on some OS X machines with fixed
+     width decimal support) (Keyur Govande)
+   . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
+     has rounding errors) (Keyur Govande)
+ 
 -22 Jan 2015, PHP 5.5.21
 +22 Jan 2015, PHP 5.6.5
  
  - Core:
    . Upgraded crypt_blowfish to version 1.3. (Leigh)