diff options
| author | ULF WENDEL <uw@php.net> | 2012-09-29 19:35:09 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-09-29 19:35:09 +0200 |
| commit | c64ff20836173fc35a22092b9e586f80ac722e22 (patch) | |
| tree | 912fc35270214d88cfc6006350c9e68000d34da9 /ext/pdo_mysql/mysql_statement.c | |
| parent | 8cdd6bc1e7dedd4733374b62feb09b88c5ca02db (diff) | |
| parent | 7aa3d0ae658d3eb386915311929c48ba300b8493 (diff) | |
| download | php-git-c64ff20836173fc35a22092b9e586f80ac722e22.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: (62 commits)
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))
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
Fix warnings preventing this test from passing
Remove executable permission on inc
Remove executable permission on phpt
Remove executable permission on phpt
Fixed bug #63236 (Executable permission on various source files)
Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
exposing the libxpm version in phpinfo
5.4.9-dev
PHP-5.3 branch is 5.3.19 now
reverted the previous fix for libpng include
...
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rw-r--r--[-rwxr-xr-x] | ext/pdo_mysql/mysql_statement.c | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index fc5ec5135b..fc5ec5135b 100755..100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c |