Merge branch 'nextrowset-fix' of https://github.com/david-puglielli/msphpsql into nextrowset-fix

source/pdo_sqlsrv/pdo_stmt.cpp

@@ -1068,7 +1068,7 @@ int pdo_sqlsrv_stmt_next_rowset( _Inout_ pdo_stmt_t *stmt TSRMLS_DC )
         SQLSRV_ASSERT( driver_stmt != NULL, "pdo_sqlsrv_stmt_next_rowset: driver_data object was null" );
 
         // Return the correct error in case the user calls nextRowset() on a null result set. 
-        // Null means that SQLNumResultCols() returns 0 and SQLRowCount is not return > 0. But first 
+        // Null means that SQLNumResultCols() returns 0 and SQLRowCount does not return > 0. But first 
         // check that the statement has been executed and that we are not past the end of a non-null 
         // result set to make sure the user gets the correct error message. These checks are also 
         // done in core_sqlsrv_next_result(), but we cannot check for null results there because that

source/sqlsrv/stmt.cpp

@@ -562,7 +562,7 @@ PHP_FUNCTION( sqlsrv_next_result )
     try {
         
         // Return the correct error in case the user calls sqlsrv_next_result() on a null result set. 
-        // Null means that SQLNumResultCols() returns 0 and SQLRowCount is not return > 0. But first 
+        // Null means that SQLNumResultCols() returns 0 and SQLRowCount does not return > 0. But first 
         // check that the statement has been executed and that we are not past the end of a non-null 
         // result set to make sure the user gets the correct error message. These checks are also 
         // done in core_sqlsrv_next_result(), but we cannot check for null results there because that

test/functional/pdo_sqlsrv/pdo_empty_result_error.phpt

@@ -7,6 +7,7 @@ Test that calling nextRowset() on an empty result set produces the correct error
 --FILE--
 <?php
 require_once("MsSetup.inc");
+require_once("MsCommon.inc");
 
 $conn = new PDO( "sqlsrv:Server = $server; Database = $databaseName; ", $uid, $pwd );
 $conn->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION );

test/functional/sqlsrv/sqlsrv_empty_result_error.phpt

@@ -7,6 +7,7 @@ Test that calling sqlsrv_next_result() on a null result set produces the correct
 --FILE--
 <?php
 require_once("MsSetup.inc");
+require_once("MsCommon.inc");
 
 $conn = sqlsrv_connect($server, array("Database"=>$databaseName, "uid"=>$uid, "pwd"=>$pwd));