felipe Fri Apr 3 22:14:05 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pdo_firebird firebird_statement.c
Log:
- Backported fix for #35386 (originally commited in 5.3+), reported recently
as 5.2 bug #47845
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1458&r2=1.2027.2.547.2.1459&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1458 php-src/NEWS:1.2027.2.547.2.1459
--- php-src/NEWS:1.2027.2.547.2.1458 Thu Apr 2 15:55:01 2009
+++ php-src/NEWS Fri Apr 3 22:14:04 2009
@@ -7,6 +7,7 @@
- Fixed memory corruptions while reading properties of zip files. (Ilia)
- Fixed memory leak in ob_get_clean/ob_get_flush. (Christian)
+- Fixed bug #47845 (PDO_Firebird omits first row from query). (Lars W)
- Fixed bug #47831 (Compile warning for strnlen() in main/spprintf.c).
(Ilia, rainer dot jung at kippdata dot de)
- Fixed bug #47828 (openssl_x509_parse() segfaults when a UTF-8 conversion
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_statement.c?r1=1.18.2.1.2.8&r2=1.18.2.1.2.9&diff_format=u
Index: php-src/ext/pdo_firebird/firebird_statement.c
diff -u php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.8
php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.9
--- php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.8 Mon Feb 9
12:07:35 2009
+++ php-src/ext/pdo_firebird/firebird_statement.c Fri Apr 3 22:14:05 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: firebird_statement.c,v 1.18.2.1.2.8 2009/02/09 12:07:35 felipe Exp $ */
+/* $Id: firebird_statement.c,v 1.18.2.1.2.9 2009/04/03 22:14:05 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -170,6 +170,7 @@
col->maxlen = var->sqllen;
col->namelen = var->aliasname_length;
col->name = estrndup(var->aliasname,var->aliasname_length);
+ col->param_type = PDO_PARAM_STR;
return 1;
}
@@ -301,11 +302,7 @@
/* A NULL value */
*ptr = NULL;
*len = 0;
- } else {
- /* override the column param type */
- /* set_param_type(&stmt->columns[colno].param_type,var); */
- stmt->columns[colno].param_type = PDO_PARAM_STR;
-
+ } else {
if (var->sqlscale < 0) {
static ISC_INT64 const scales[] = { 1, 10, 100, 1000,
10000, 100000, 1000000,
100000000, 1000000000, 1000000000,
LL_LIT(10000000000),LL_LIT(100000000000),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
