com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pdo/pdo _sql_parser.c
| From: | Michael Wallner | Date: | Tue, 20 Aug 2013 17:21:53 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pdo/pdo _sql_parser.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73031@lists.php.net to get a copy of this message | ||
Commit: 7f3e7eb95812649fd421b405990a96091010b8e9
Author: Michael Wallner <mike@php.net> Tue, 20 Aug 2013 19:21:53 +0200
Parents: 4cd9796be78bfb1cc88b5ed71cbd61e56937b8e7 27c803aaed259f76a66db1278eea05f30a8ec956
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7f3e7eb95812649fd421b405990a96091010b8e9
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64953 (Postgres prepared statement positional parameter casting)
Conflicts:
ext/pdo/pdo_sql_parser.c
Bugs:
https://bugs.php.net/64953
Changed paths:
MM ext/pdo/pdo_sql_parser.c
Diff: