wez Sun Apr 30 01:27:33 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/pdo_odbc odbc_driver.c
Log:
Fix #36632
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.537&r2=1.2027.2.538&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.537 php-src/NEWS:1.2027.2.538
--- php-src/NEWS:1.2027.2.537 Sun Apr 30 00:52:28 2006
+++ php-src/NEWS Sun Apr 30 01:27:33 2006
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, PHP 5.2.0
- Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).
+- Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez).
28 Apr 2006, PHP 5.1.3
- Updated bundled PCRE library to version 6.6. (Andrei)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_odbc/odbc_driver.c?r1=1.27.2.3&r2=1.27.2.4&diff_format=u
Index: php-src/ext/pdo_odbc/odbc_driver.c
diff -u php-src/ext/pdo_odbc/odbc_driver.c:1.27.2.3
php-src/ext/pdo_odbc/odbc_driver.c:1.27.2.4
--- php-src/ext/pdo_odbc/odbc_driver.c:1.27.2.3 Sun Apr 30 00:52:28 2006
+++ php-src/ext/pdo_odbc/odbc_driver.c Sun Apr 30 01:27:33 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: odbc_driver.c,v 1.27.2.3 2006/04/30 00:52:28 wez Exp $ */
+/* $Id: odbc_driver.c,v 1.27.2.4 2006/04/30 01:27:33 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -234,6 +234,14 @@
rc = SQLExecDirect(stmt, (char *)sql, sql_len);
+ if (rc == SQL_NO_DATA) {
+ /* If SQLExecDirect executes a searched update or delete
statement that
+ * does not affect any rows at the data source, the call to
+ * SQLExecDirect returns SQL_NO_DATA. */
+ row_count = 0;
+ goto out;
+ }
+
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
pdo_odbc_doer_error("SQLExecDirect");
goto out;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
