From: Joe Watkins <krakjoe@php.net>
Date: Tue, 25 Jul 2017 05:51:44 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0beta2~43^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78ad5e8864feec55e3aecfd96b369a62ffb953ee;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  minor loop optimizations, closes #2633
---

78ad5e8864feec55e3aecfd96b369a62ffb953ee
diff --cc ext/mysqli/mysqli_api.c
index 9f176c9fb0,6793fc8065..f0730839de
--- 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;