]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorKeyur Govande <keyur@php.net>
Fri, 15 Aug 2014 23:47:31 +0000 (23:47 +0000)
committerKeyur Govande <keyur@php.net>
Fri, 15 Aug 2014 23:47:31 +0000 (23:47 +0000)
* PHP-5.6:
  Update NEWS
  Fix another failing test
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

1  2 
ext/mysqlnd/config9.m4
ext/mysqlnd/mysqlnd_ps_codec.c

Simple merge
Simple merge