com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/mysqli/mysqli.c ext/mysqli/mysqli_api.c

Commit: 78ad5e8864feec55e3aecfd96b369a62ffb953ee Author: Joe Watkins <krakjoe@php.net> Tue, 25 Jul 2017 06:51:44 +0100 Parents: dbc2ffba822d13e74e37f5ba6e106f163c1008e8 69b48f83dfc287a8430cf8e993d0937c5128623f Branches: PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=78ad5e8864feec55e3aecfd96b369a62ffb953ee Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: minor loop optimizations, closes #2633 Bugs: https://bugs.php.net/2633 Changed paths: MM ext/mysqli/mysqli.c MM ext/mysqli/mysqli_api.c Diff: diff --cc ext/mysqli/mysqli_api.c index 9f176c9,6793fc8..f073083 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api..c @@@ -1266,12 -1267,8 +1267,12 @@@ PHP_FUNCTION(mysqli_fetch_lengths { MYSQL_RES *result; zval *mysql_result; - unsigned int i; + unsigned int i, num_fields; - zend_ulong *ret; +#if defined(MYSQLI_USE_MYSQLND) + const size_t *ret; +#else + const zend_ulong *ret; +#endif if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) { return;