]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorKeyur Govande <keyur@php.net>
Fri, 26 Dec 2014 20:38:26 +0000 (20:38 +0000)
committerKeyur Govande <keyur@php.net>
Fri, 26 Dec 2014 20:38:26 +0000 (20:38 +0000)
commite4ef6bf2e5532974a3cad4e882a40d8c6264e649
tree2c63589f2dfa7e74c3618f39f972d1826b8f009c
parent2d212b426a22c9d9f357be0a6832ced9a3fff073
parent83e55478279f8bb366e5f5a482619c5e47731980
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix for failing tests. gcc 4.8.3 would optimize away the assigment.
ext/mysqlnd/mysqlnd_ps_codec.c