From: Andi Gutmans <andi@php.net>
Date: Thu, 17 Feb 2005 20:11:20 +0000 (+0000)
Subject: - Fix Bug #31960: msql_fetch_row() and msql_fetch_array() dropping columns with NULL... 
X-Git-Tag: RELEASE_0_2_4~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27b13ba47cef74699b6b2d11cf8d9f1c29d45194;p=php

- Fix Bug #31960: msql_fetch_row() and msql_fetch_array() dropping columns with NULL values
---

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 93522865b2..6a7231bba2 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -958,9 +958,14 @@ static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 				add_assoc_stringl(return_value, msql_field->name, data, data_len, should_copy);
 			}
 		} else {
-			/*
-			add_get_index_stringl(return_value, i, "", 0, (void **) &pval_ptr, 1);
-			*/
+			/* NULL value. */
+			if (result_type & MSQL_NUM) {
+				add_index_null(return_value, i);
+			}
+
+			if (result_type & MSQL_ASSOC) {
+				add_assoc_null(return_value, msql_field->name);
+			}
 		}
 	}
 }