Corrected bug in php_mysql_fetch_hash() that prevented columns with NULL values from...

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index e73e6c0357974b3ea422482eba174e42dd403b51..e2a48830b6577b9fe7ad86ca2021a019ac5ce3ea 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1633,10 +1633,13 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type,
                        }
                } else {
                        /* NULL value. */
-                       if (result_type & MYSQL_NUM)
+                       if (result_type & MYSQL_NUM) {
                                add_index_null(return_value, i);
-                       else
+            }
+
+            if (result_type & MYSQL_ASSOC) {
                                add_assoc_null(return_value, mysql_field->name);
+            }
                }
        }
 }