From 63fbc274661ffc1e55b951434813a84c2f6542e4 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 18 Jan 2005 15:03:51 +0000 Subject: fix bug #30430 (odbc_next_result() doesn't bind values and that results in segfault) fix protos --- ext/odbc/php_odbc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ext/odbc/php_odbc.c') diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 46825a53aa..3cb6b7f639 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2465,10 +2465,7 @@ PHP_FUNCTION(odbc_next_result) result->fetched = 0; rc = SQLMoreResults(result->stmt); - if (rc == SQL_SUCCESS) { - RETURN_TRUE; - } - else if (rc == SQL_SUCCESS_WITH_INFO) { + if (rc == SQL_SUCCESS_WITH_INFO || rc == SQL_SUCCESS) { rc = SQLFreeStmt(result->stmt, SQL_UNBIND); SQLNumParams(result->stmt, &(result->numparams)); SQLNumResultCols(result->stmt, &(result->numcols)); @@ -2809,7 +2806,7 @@ PHP_FUNCTION(odbc_setoption) * metadata functions */ -/* {{{ proto resource odbc_tables(resource connection_id [, string qualifier, string owner, string name, string table_types]) +/* {{{ proto resource odbc_tables(resource connection_id [, string qualifier [, string owner [, string name [, string table_types]]]]) Call the SQLTables function */ PHP_FUNCTION(odbc_tables) { @@ -2888,7 +2885,7 @@ PHP_FUNCTION(odbc_tables) } /* }}} */ -/* {{{ proto resource odbc_columns(resource connection_id, string qualifier, string owner, string table_name, string column_name) +/* {{{ proto resource odbc_columns(resource connection_id [, string qualifier [, string owner [, string table_name [, string column_name]]]]) Returns a result identifier that can be used to fetch a list of column names in specified tables */ PHP_FUNCTION(odbc_columns) { -- cgit v1.2.1