com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/mysql i/mysqli_prop.c

From: Date: Tue, 25 Feb 2014 19:19:04 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/mysql i/mysqli_prop.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76201@lists.php.net to get a copy of this message
Commit: 05db0cbcc0c2a087f41b6c9ce4fbd00deccb15d6 Author: Anatol Belski <ab@php.net> Tue, 25 Feb 2014 20:19:04 +0100 Parents: 1ccc6d0a73f3052ee89ba8cdac0343133ea70f84 aad7b724721c01f6269951511ee4c92843f56e0c Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=05db0cbcc0c2a087f41b6c9ce4fbd00deccb15d6 Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport * origin/PHP-5.6: Use API instead of directly acessing the structure Conflicts: ext/mysqli/mysqli_prop.c Changed paths: MM ext/mysqli/mysqli_prop.c Diff: diff --cc ext/mysqli/mysqli_prop.c index fcddf4e,2d36336..0e8941b --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@@ -310,21 -310,23 +310,23 @@@ static int result_type_read(mysqli_obje static int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC) { MYSQL_RES *p; - ulong *ret; - uint field_count; + php_uint_t *ret; ++ php_uint_t field_count; MAKE_STD_ZVAL(*retval); CHECK_STATUS(MYSQLI_STATUS_VALID); p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; - if (!p || !p->field_count || !(ret = mysql_fetch_lengths(p))) { + field_count = mysql_num_fields(p); + if (!p || !field_count || !(ret = mysql_fetch_lengths(p))) { ZVAL_NULL(*retval); } else { - ulong i; + php_uint_t i; array_init(*retval); - for (i = 0; i < p->field_count; i++) { + for (i = 0; i < field_count; i++) { - add_index_long(*retval, i, ret[i]); + add_index_int(*retval, i, ret[i]); } } return SUCCESS;

« previous php.cvs (#76201) next »