From: Frank M. Kromann <fmk@php.net>
Date: Tue, 20 Apr 2004 23:30:51 +0000 (+0000)
Subject: Fix problem getting return value from stored procedure when it returns multiple results
X-Git-Tag: php-5.0.0RC2RC2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5f887173427967f9a53911ea80c7bc13c311042;p=php

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

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 243ebcbc81..c4708802b5 100644
--- 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 {