summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-10-18 17:37:49 -0700
committerChristopher Jones <sixd@php.net>2012-10-18 17:37:49 -0700
commit8bfc00287165b45e8f9759b6914261340161fa34 (patch)
tree7161a65c14fe5f7869b5215cc010478ec55fc8ab /ext/mysql/php_mysql.c
parentde8b0cfda7c3931e70ed5df278a5d7174d8b59c3 (diff)
parent4980b24025737234c03eb09f342b66c8c2b99109 (diff)
downloadphp-git-8bfc00287165b45e8f9759b6914261340161fa34.tar.gz
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: (22 commits) - 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) I forgot that inconsistent is only avaliable in debug mode Add comments 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 Fixed bug #63248 Load multiple magic files on win Cover have_ssl=NO and have_ssl=DISABLED - BFN - Fixed bug #63214 (Large PDO Firebird Queries) 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 Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1)) ...
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions