]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 54fe719 890ea84)
Merge branch 'PHP-5.4' into PHP-5.5
authorRasmus Lerdorf <rasmus@php.net>
Fri, 8 Nov 2013 02:09:15 +0000 (18:09 -0800)
committerRasmus Lerdorf <rasmus@php.net>
Fri, 8 Nov 2013 02:09:15 +0000 (18:09 -0800)
commitb3d522d215681d641e9827e10f1b09a7659bc589
tree5f402ff33ee10e0beaed0f01d751a11ae0ac8288tree | snapshot
parent54fe719953eec91e4416addae1bda2c3f9ce82bbcommit | diff
parent890ea8411f908ee8ab84389b42066f66d4a033e6commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings

Conflicts:
ext/pdo/pdo_sql_parser.c
ext/pdo/pdo_sql_parser.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.