From 0728a1da5ab8e23ebd2a0fee6f4534bef17cca1a Mon Sep 17 00:00:00 2001
From: David Puglielli <v-dapugl@microsoft.com>
Date: Fri, 29 Sep 2017 14:52:33 -0700
Subject: [PATCH 1/4] Update pdo_empty_result_error.phpt

---
 test/functional/pdo_sqlsrv/pdo_empty_result_error.phpt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/pdo_sqlsrv/pdo_empty_result_error.phpt b/test/functional/pdo_sqlsrv/pdo_empty_result_error.phpt
index dda98156..583dc2ae 100644
--- a/test/functional/pdo_sqlsrv/pdo_empty_result_error.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_empty_result_error.phpt
@@ -5,6 +5,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 );

From dc6e2a34fa67d844158cdd9483bef13c7e383916 Mon Sep 17 00:00:00 2001
From: David Puglielli <v-dapugl@microsoft.com>
Date: Fri, 29 Sep 2017 14:52:51 -0700
Subject: [PATCH 2/4] Update sqlsrv_empty_result_error.phpt

---
 test/functional/sqlsrv/sqlsrv_empty_result_error.phpt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt b/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt
index ba07801e..c3085f7c 100644
--- a/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt
+++ b/test/functional/sqlsrv/sqlsrv_empty_result_error.phpt
@@ -5,6 +5,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));
 

From 9e928672d489354cb29dac21db3ee1d75477c68c Mon Sep 17 00:00:00 2001
From: David Puglielli <v-dapugl@microsoft.com>
Date: Fri, 29 Sep 2017 16:17:39 -0700
Subject: [PATCH 3/4] Update pdo_stmt.cpp

---
 source/pdo_sqlsrv/pdo_stmt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/pdo_sqlsrv/pdo_stmt.cpp b/source/pdo_sqlsrv/pdo_stmt.cpp
index fe2ff5fa..d0b487d0 100644
--- a/source/pdo_sqlsrv/pdo_stmt.cpp
+++ b/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

From 4674f58a15007e6527fb4ff3deff7e4252fd4b16 Mon Sep 17 00:00:00 2001
From: David Puglielli <v-dapugl@microsoft.com>
Date: Fri, 29 Sep 2017 16:18:27 -0700
Subject: [PATCH 4/4] Update stmt.cpp

---
 source/sqlsrv/stmt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/sqlsrv/stmt.cpp b/source/sqlsrv/stmt.cpp
index 8f5abb6c..076dba1a 100644
--- a/source/sqlsrv/stmt.cpp
+++ b/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