cvs: php4 /ext/mysql php_mysql.c
| From: | Zak Greant | Date: | Sun, 30 Dec 2001 10:00:27 +0000 |
| Subject: | cvs: php4 /ext/mysql php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8860@lists.php.net to get a copy of this message | ||
zak Sun Dec 30 05:00:27 2001 EDT
Modified files:
/php4/ext/mysql php_mysql.c
Log:
Corrected bug in php_mysql_fetch_hash() that prevented columns with NULL values from having both
numeric and associative indexes. (Bug 14291)
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.114 php4/ext/mysql/php_mysql.c:1.115
--- php4/ext/mysql/php_mysql.c:1.114 Sun Dec 23 09:37:24 2001
+++ php4/ext/mysql/php_mysql.c Sun Dec 30 05:00:26 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.114 2001/12/23 14:37:24 alexwaugh Exp $ */
+/* $Id: php_mysql.c,v 1.115 2001/12/30 10:00:26 zak Exp $ */
/* TODO:
@@ -1633,10 +1633,13 @@
}
} 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);
+ }
}
}
}