tony2001 Thu Jun 2 11:42:45 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/odbc php_odbc.c
/php-src NEWS
Log:
MFH: fix bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches).
Path by rich at kastle dot com.
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.179.2.3&r2=1.179.2.4&ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.179.2.3
php-src/ext/odbc/php_odbc.c:1.179.2.4
--- php-src/ext/odbc/php_odbc.c:1.179.2.3 Tue Jan 18 10:07:10 2005
+++ php-src/ext/odbc/php_odbc.c Thu Jun 2 11:42:44 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.179.2.3 2005/01/18 15:07:10 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.179.2.4 2005/06/02 15:42:44 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2437,8 +2437,10 @@
result->values = NULL;
}
RETURN_TRUE;
- }
- else {
+ } else if (rc == SQL_NO_DATA_FOUND) {
+ RETURN_FALSE;
+ } else {
+ odbc_sql_error(result->conn_ptr, result->stmt,
"SQLMoreResults");
RETURN_FALSE;
}
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.412&r2=1.1760.2.413&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.412 php-src/NEWS:1.1760.2.413
--- php-src/NEWS:1.1760.2.412 Thu Jun 2 04:31:03 2005
+++ php-src/NEWS Thu Jun 2 11:42:44 2005
@@ -13,6 +13,8 @@
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
+- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
+ 2-statement SQL batches). (rich at kastle dot com, Tony)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
