Happy new year (especially to Thies :)

- Zend branch patches merged in - get the PHP tree uptodate
- Clean

2 files changed, 2 insertions, 4 deletions

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index c63df6da0f..dfe4258545 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1255,9 +1255,7 @@ PHP_FUNCTION(mysql_result)
 			return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
 		}
 	} else {
-		return_value->value.str.val = undefined_variable_string;
-		return_value->value.str.len=0;
-		return_value->type = IS_STRING;
+		return_value->type = IS_UNSET;
 	}
 	
 	return_value->type = IS_STRING;
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 22bf7e97c8..c13eaeabee 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -246,7 +246,7 @@ PHP_FUNCTION(count)
 	}
 	target_hash = HASH_OF(*array);
 	if (!target_hash) {
-		if ((*array)->type == IS_STRING && (*array)->value.str.val==undefined_variable_string) {
+		if ((*array)->type == IS_UNSET) {
 			RETURN_LONG(0);
 		} else {
 			RETURN_LONG(1);