com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pdo/pdo _sql_parser.c
| From: | Rasmus Lerdorf | Date: | Fri, 08 Nov 2013 02:09:15 +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-73890@lists.php.net to get a copy of this message | ||
Commit: b3d522d215681d641e9827e10f1b09a7659bc589
Author: Rasmus Lerdorf <rasmus@php.net> Thu, 7 Nov 2013 18:09:15 -0800
Parents: 54fe719953eec91e4416addae1bda2c3f9ce82bb 890ea8411f908ee8ab84389b42066f66d4a033e6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b3d522d215681d641e9827e10f1b09a7659bc589
Log:
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
Bugs:
https://bugs.php.net/65946
Changed paths:
MM ext/pdo/pdo_sql_parser.c
Diff: