Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  remove unneeded free parts

1 files changed, 0 insertions, 22 deletions

diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
index 43802264b6..d8cd219b4a 100644
--- a/ext/pdo_dblib/dblib_stmt.c
+++ b/ext/pdo_dblib/dblib_stmt.c
@@ -103,17 +103,6 @@ static int pdo_dblib_stmt_cursor_closer(pdo_stmt_t *stmt)
 	/* Cancel any pending results */
 	dbcancel(H->link);
 	
-	if (stmt->columns) {
-		int i = 0;
-		for (; i < stmt->column_count; i++) {
-			if (stmt->columns[i].name) {
-				zend_string_release(stmt->columns[i].name);
-			}
-		}
-		efree(stmt->columns); 
-		stmt->columns = NULL;
-	}
-
 	return 1;
 }
 
@@ -121,17 +110,6 @@ static int pdo_dblib_stmt_dtor(pdo_stmt_t *stmt)
 {
 	pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
 
-	if (stmt->columns) {
-		int i = 0;
-		for (; i < stmt->column_count; i++) {
-			if (stmt->columns[i].name) {
-				zend_string_release(stmt->columns[i].name);
-			}
-		}
-		efree(stmt->columns); 
-		stmt->columns = NULL;
-	}
-
 	efree(S);
 
 	return 1;