summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeyur Govande <keyur@php.net>2015-01-26 21:32:32 +0000
committerKeyur Govande <keyur@php.net>2015-01-26 21:32:32 +0000
commit168877bc78376fe7c0e3130c5305c66d2865eb38 (patch)
tree62cdb91bde84d95ac9e5e1c7676090955d47ddc3
parent4c6918ec17dba26203c0ff3330dccf8b5f84d867 (diff)
parentd065a2fc1baa01fa8788c9fb2811ce7707cf5088 (diff)
downloadphp-git-168877bc78376fe7c0e3130c5305c66d2865eb38.tar.gz
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
-rw-r--r--NEWS6
1 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 01621236eb..cec955c572 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,12 @@
. 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.6.5
- Core: