com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/pgsql/pgsql.c
| From: | Adam Harvey | Date: | Tue, 30 Dec 2014 17:59:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83940@lists.php.net to get a copy of this message | ||
Commit: 3ef6e3726cd4006d7530b3ff5b27cb7abad7cc95
Author: Adam Harvey <aharvey@php.net> Tue, 30 Dec 2014 17:59:39 +0000
Parents: ab3a746a2d3b8dc94d1b3c89cf424d1032f88dfa 211f4ceeaec62929eb1e217ceadaac037b1cb799
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3ef6e3726cd4006d7530b3ff5b27cb7abad7cc95
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Check the return value of lo_export.
Changed paths:
MM NEWS
MM ext/pgsql/pgsql.c
Diff:
diff --cc NEWS
index e282f68,f91a555..a457ed5
--- a/NEWS
+++ b/NEWS
@@@ -60,7 -47,10 +60,10 @@@
. Fixed bug #66679 (Alignment Bug in PCRE 8.34 upstream).
(Rainer Jung, Anatol Belski)
+ - pgsql:
+ . Fixed bug #68697 (lo_export return -1 on failure). (Ondřej Surý)
+
-- PDO_mysql
+- PDO_mysql:
. Fixed bug #68424 (Add new PDO mysql connection attr to control multi
statements option). (peter dot wolanin at acquia dot com)