iliaa Wed Oct 31 12:58:24 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/pdo/tests bug_43139.phpt
Modified files:
/php-src/ext/pdo pdo_stmt.c
/php-src NEWS
Log:
MFB: Fixed bug #43139 PDO ignores ATTR_DEFAULT_FETCH_MODE in some cases with
fetchAll()
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.25&r2=1.118.2.38.2.26&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.25
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.26
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.25 Thu Oct 11 20:56:22 2007
+++ php-src/ext/pdo/pdo_stmt.c Wed Oct 31 12:58:24 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.25 2007/10/11 20:56:22 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.26 2007/10/31 12:58:24 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -1546,6 +1546,10 @@
}
}
+ if ((how & ~PDO_FETCH_FLAGS) == PDO_FETCH_USE_DEFAULT) {
+ how |= stmt->default_fetch_type & ~PDO_FETCH_FLAGS;
+ }
+
if (!error) {
PDO_STMT_CLEAR_ERR();
MAKE_STD_ZVAL(data);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.991&r2=1.2027.2.547.2.992&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.991 php-src/NEWS:1.2027.2.547.2.992
--- php-src/NEWS:1.2027.2.547.2.991 Mon Oct 29 22:37:25 2007
+++ php-src/NEWS Wed Oct 31 12:58:24 2007
@@ -40,6 +40,8 @@
- Fixed htmlentities/htmlspecialchars not to accept partial multibyte
sequences. (Stas)
+- Fixed bug #43139 (PDO ignores ATTR_DEFAULT_FETCH_MODE in some cases with
+ fetchAll()). (Ilia)
- Fixed bug #43130 (Bound parameters cannot have - in their name). (Ilia)
- Fixed bug #43099 (XMLWriter::endElement() does not check # of params).
(Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_43139.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo/tests/bug_43139.phpt
+++ php-src/ext/pdo/tests/bug_43139.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
