Fix problem getting return value from stored procedure when it returns multiple results

fmk · fmk · commit c5f887173427 · 2004-04-20T23:30:51.000Z
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
@@ -1080,7 +1080,7 @@ static int _mssql_fetch_batch(mssql_link *mssql_ptr, mssql_result *result, int r
 		result->lastresult = retvalue;
 	}
 	efree(column_types);
-	if (result->statement) {
+	if (result->statement && (retvalue == NO_MORE_RESULTS || retvalue == NO_MORE_RPC_RESULTS)) {
 		_mssql_get_sp_result(mssql_ptr, result->statement TSRMLS_CC);
 	}
 	return i;
@@ -1803,6 +1803,9 @@ PHP_FUNCTION(mssql_next_result)
 		RETURN_FALSE;
 	}
 	else if (retvalue == NO_MORE_RESULTS || retvalue == NO_MORE_RPC_RESULTS) {
+		if (result->statement) {
+			_mssql_get_sp_result(mssql_ptr, result->statement TSRMLS_CC);
+		}
 		RETURN_FALSE;
 	}
 	else {

Original file line number	Diff line number	Diff line change
`@@ -1080,7 +1080,7 @@ static int _mssql_fetch_batch(mssql_link mssql_ptr, mssql_result result, int r`
`1080`	`1080`	`result->lastresult = retvalue;`
`1081`	`1081`	`}`
`1082`	`1082`	`efree(column_types);`
`1083`		`- if (result->statement) {`
	`1083`	`+ if (result->statement && (retvalue == NO_MORE_RESULTS \|\| retvalue == NO_MORE_RPC_RESULTS)) {`
`1084`	`1084`	`_mssql_get_sp_result(mssql_ptr, result->statement TSRMLS_CC);`
`1085`	`1085`	`}`
`1086`	`1086`	`return i;`
`@@ -1803,6 +1803,9 @@ PHP_FUNCTION(mssql_next_result)`
`1803`	`1803`	`RETURN_FALSE;`
`1804`	`1804`	`}`
`1805`	`1805`	`else if (retvalue == NO_MORE_RESULTS \|\| retvalue == NO_MORE_RPC_RESULTS) {`
	`1806`	`+ if (result->statement) {`
	`1807`	`+ _mssql_get_sp_result(mssql_ptr, result->statement TSRMLS_CC);`
	`1808`	`+ }`
`1806`	`1809`	`RETURN_FALSE;`
`1807`	`1810`	`}`
`1808`	`1811`	`else {`