diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-01-18 15:11:22 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-01-18 15:11:22 +0000 |
| commit | 744713745311fea40c5f9d96d6f6b195894e0185 (patch) | |
| tree | ba8231ab52a5858a61a8be416ca330ac5fc7b7a9 /ext/odbc/php_odbc.c | |
| parent | be64d7c3de54d1283ed7bef61afebec2f50a0ced (diff) | |
| download | php-git-744713745311fea40c5f9d96d6f6b195894e0185.tar.gz | |
MFH: fix bug #30430 (odbc_next_result() doesn't bind values and that results in segfault)
fix protos
Diffstat (limited to 'ext/odbc/php_odbc.c')
| -rw-r--r-- | ext/odbc/php_odbc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index e435fcf87f..a053e99f45 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2422,10 +2422,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)); @@ -2766,7 +2763,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) { @@ -2845,7 +2842,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) { |