]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cd9796 27c803a)
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Tue, 20 Aug 2013 17:21:53 +0000 (19:21 +0200)
committerMichael Wallner <mike@php.net>
Tue, 20 Aug 2013 17:21:53 +0000 (19:21 +0200)
* PHP-5.4:
  Fix bug #64953 (Postgres prepared statement positional parameter casting)

Conflicts:
ext/pdo/pdo_sql_parser.c

1  2 
ext/pdo/pdo_sql_parser.c patch | diff1 | diff2 | blob | history

diff --cc ext/pdo/pdo_sql_parser.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.