]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Mon, 8 Jul 2013 20:30:54 +0000 (13:30 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 8 Jul 2013 20:30:54 +0000 (13:30 -0700)
commit79df8cf9c2958eecee58da9859db10ee36af1753
tree6a51ff7f6c31d6e99a248eada3e2052d26ebc680
parente4a28b7b7b972fecd01458364c0663195352891e
parent2c3f6dcdb6de8cd43371e91fb470e547aa217327
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed segfault in mysqlnd when doing long prepare