summaryrefslogtreecommitdiff
path: root/ext/odbc
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2005-06-02 15:40:45 +0000
committerAntony Dovgal <tony2001@php.net>2005-06-02 15:40:45 +0000
commit7e450f528cc44ac7096e3e0a5c9a2fad4ed59417 (patch)
tree6af25186ef8379171bc957894d6c5b6b0c6e42ea /ext/odbc
parentad21bb1baa0484c398ea5c1a6cfa1a2b3a0ac753 (diff)
downloadphp-git-7e450f528cc44ac7096e3e0a5c9a2fad4ed59417.tar.gz
fix bug #33214 (odbc_next_result does not signal SQL errors with 2-statement SQL batches).
Path by rich at kastle dot com.
Diffstat (limited to 'ext/odbc')
-rw-r--r--ext/odbc/php_odbc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 3cb6b7f639..1b11986d20 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2479,8 +2479,10 @@ PHP_FUNCTION(odbc_next_result)
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;
}
}