diff options
| author | ULF WENDEL <uw@php.net> | 2012-10-23 13:16:12 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-10-23 13:16:12 +0200 |
| commit | 38b632dd7c1d6a935f859e53d69cc3ce3c373c94 (patch) | |
| tree | befeed2d1a27d9b0a7f80bf302694170e79f16c0 /ext/pdo_mysql/mysql_statement.c | |
| parent | 77fd708a0b81bf6dfcfce6aba24eaa606b97f630 (diff) | |
| parent | f962260081c4341c768533c5fb23c83c6ca9b1ed (diff) | |
| download | php-git-38b632dd7c1d6a935f859e53d69cc3ce3c373c94.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
merged changes for bug #63297 from 5.3
fixed a typo in the error message
Fixed bug #63297 Phar fails to write an openssl based signature
enabled libxpm for gd on windows
enabled libxpm for gd on windows
Update test script
Test for #63336, xfail now
Fixed bug #63305 (zend_mm_heap corrupted with traits)
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
0 files changed, 0 insertions, 0 deletions