fix bug #30430 (odbc_next_result() doesn't bind values and that results in segfault)

fix protos

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 46825a53aac73d693fa4c90fbfeb3360c159ea2f..3cb6b7f639409dfb0737455176fa98540ac3048d 100644 (file)
--- 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)
 {