From bca311081d8b3ee3c920d0edfc6e5ceaed0b59fb Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Tue, 15 May 2018 12:41:28 -0700
Subject: [PATCH] Modified the output param initial value

---
 source/shared/core_stmt.cpp                          |  2 +-
 .../functional/sqlsrv/srv_699_out_param_integer.phpt | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/shared/core_stmt.cpp b/source/shared/core_stmt.cpp
index c55e72cc..bc090e07 100644
--- a/source/shared/core_stmt.cpp
+++ b/source/shared/core_stmt.cpp
@@ -487,7 +487,7 @@ void core_sqlsrv_bind_param( _Inout_ sqlsrv_stmt* stmt, _In_ SQLUSMALLINT param_
                 // if it is boolean, set the lval to 0 or 1
                 convert_to_long( param_z );
                 buffer = &param_z->value;
-                buffer_len = sizeof(int); //sizeof( Z_LVAL_P( param_z ));
+                buffer_len = sizeof(int); // do not use size of a zend_long 
                 ind_ptr = buffer_len;
                 if( direction != SQL_PARAM_INPUT ){
                     // save the parameter so that 1) the buffer doesn't go away, and 2) we can set it to NULL if returned
diff --git a/test/functional/sqlsrv/srv_699_out_param_integer.phpt b/test/functional/sqlsrv/srv_699_out_param_integer.phpt
index caf939b3..e760b9bf 100644
--- a/test/functional/sqlsrv/srv_699_out_param_integer.phpt
+++ b/test/functional/sqlsrv/srv_699_out_param_integer.phpt
@@ -9,14 +9,14 @@ PHPT_EXEC=true
 <?php require('skipif.inc'); ?>
 --FILE--
 <?php
-/*
+
 if (strtoupper(substr(PHP_OS, 0, 3)) === 'LIN') {
-    // This test fails in Linux (unixODBC issue) but not Windows or mac. 
-    // See VSO 3459 for details.
+    // This test fails in Linux, but not Windows or mac. This test requires 
+    // unixODBC 2.3.4 or above (see the list of bug fixes in www.unixodbc.org
     echo "Done\n";
     return;
 }
-*/
+
 require_once('MsCommon.inc');
 
 $connectionOptions = array("CharacterSet"=> "UTF-8", "ConnectionPooling"=>1);
@@ -65,8 +65,8 @@ if (!$stmt) {
 
 $sql_callSP = "{call $procName(?)}";
 
-// Initialize the output parameter
-$outParam = 1; 
+// Initialize the output parameter to any number
+$outParam = -1; 
 $params = array(array(&$outParam, SQLSRV_PARAM_OUT));
 $stmt = sqlsrv_query($conn, $sql_callSP, $params); 
 if (!$stmt) {