]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorKeyur Govande <keyur@php.net>
Fri, 15 Aug 2014 23:47:06 +0000 (23:47 +0000)
committerKeyur Govande <keyur@php.net>
Fri, 15 Aug 2014 23:47:06 +0000 (23:47 +0000)
commit032dee4982f16363e648a52fa79073cb4519efa1
tree3ca2fe6d8e934a05d5aa79405edb1eba7ea2e0f8
parent3e6cfeed8f4c3410bbb67c45585510654e0c7425
parent6279246d2c60437c583f9c273075579bf17be654
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update NEWS
  Fix another failing test
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Conflicts:
ext/mysqli/tests/mysqli_change_user.phpt
ext/mysqli/tests/mysqli_change_user.phpt
ext/mysqli/tests/mysqli_change_user_oo.phpt
ext/mysqlnd/config9.m4
ext/mysqlnd/mysqlnd_ps_codec.c