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)
commit83e55478279f8bb366e5f5a482619c5e47731980
treeb7554899ac88bedfcde953f37e3762d362190b57
parent76d6c4f9ec37558f5aa95e2325e5b9360bfe129e
parentaa192f57c9d867ab3d7be69c7f269cfd7a10d14f
Merge branch 'PHP-5.5' into PHP-5.6

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