tony2001 Mon Nov 27 12:14:09 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
MFH: fix #39564 (PDO::errorInfo() returns inconsistent information when
sqlite3_step() fails)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.377&r2=1.2027.2.547.2.378&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.377 php-src/NEWS:1.2027.2.547.2.378
--- php-src/NEWS:1.2027.2.547.2.377 Sun Nov 26 16:26:18 2006
+++ php-src/NEWS Mon Nov 27 12:14:09 2006
@@ -50,6 +50,8 @@
- Fixed bug #39602 (Invalid session.save_handler crashes PHP). (Dmitry)
- Fixed bug #39583 (ftp_put() does not change transfer mode to ASCII). (Tony)
- Fixed bug #39576 (array_walk() doesn't separate userdata zval). (Tony)
+- Fixed bug #39564 (PDO::errorInfo() returns inconsistent information when
+ sqlite3_step() fails). (Tony)
- Fixed bug #39548 (ZMSG_LOG_SCRIPT_NAME not routed to OutputDebugString()
on Windows). (Dmitry)
- Fixed bug #39538 (fgetcsv can't handle starting newlines and trailing odd
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4&r2=1.18.2.4.2.1&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.1
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4 Sun Jan 1 12:50:12 2006
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Mon Nov 27 12:14:09 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4 2006/01/01 12:50:12 sniper Exp $ */
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.1 2006/11/27 12:14:09 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -66,6 +66,7 @@
return 1;
case SQLITE_ERROR:
+ sqlite3_reset(S->stmt);
case SQLITE_MISUSE:
case SQLITE_BUSY:
default:
@@ -171,6 +172,8 @@
sqlite3_reset(S->stmt);
return 0;
+ case SQLITE_ERROR:
+ sqlite3_reset(S->stmt);
default:
pdo_sqlite_error_stmt(stmt);
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
