]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorKeyur Govande <keyur@php.net>
Fri, 26 Dec 2014 20:37:50 +0000 (20:37 +0000)
committerKeyur Govande <keyur@php.net>
Fri, 26 Dec 2014 20:37:50 +0000 (20:37 +0000)
* PHP-5.5:
  Fix for failing tests. gcc 4.8.3 would optimize away the assigment.

1  2 
ext/mysqlnd/mysqlnd_ps_codec.c

Simple merge