summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql/mysql_statement.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-10-18 17:37:21 -0700
committerChristopher Jones <sixd@php.net>2012-10-18 17:37:21 -0700
commit79a048f76f767b071f49b79e4b2c224986e849a2 (patch)
tree802a7d094c47088daa0a1f534f5bd601ffefdad8 /ext/pdo_mysql/mysql_statement.c
parent131dd88505d5a9588ede36b22206bf13965d9137 (diff)
parent8f7a6c3029bd1f5731492aa9897c26f421961191 (diff)
downloadphp-git-79a048f76f767b071f49b79e4b2c224986e849a2.tar.gz
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/repository/php-src: - Updated to version 2012.7 (2012g) SUpport newer bisons. Merge the fix for #61964 to 5.3, which will fix #63304 indent better fix for #63055 Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite) PHP 5.3.18 NEWS fix NEWS fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql Cover have_ssl=NO and have_ssl=DISABLED Minor changes for MySQL 5.6 NEWS for 76601c4 Fix bug #63240 on stream_get_line() extended the SKIPIF section with ICU 49 (sync with 5.4 branch) fixed tests for gd having freetype >= 2.4.10
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
0 files changed, 0 insertions, 0 deletions