archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.4' into PHP-5.5

Browse source 
Conflicts:
	Zend/acinclude.m4
This commit is contained in:
Johannes Schlüter 2013-07-03 16:58:20 +02:00
commit 631bb27dca
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/mysqli/mysqli_nonapi.c
View file

@ -562,7 +562,7 @@ PHP_FUNCTION(mysqli_query)
MY_MYSQL *mysql; MY_MYSQL *mysql;
zval *mysql_link; zval *mysql_link;
MYSQLI_RESOURCE *mysqli_resource; MYSQLI_RESOURCE *mysqli_resource;
MYSQL_RES *result; MYSQL_RES *result = NULL;
char *query = NULL; char *query = NULL;
int query_len; int query_len;
long resultmode = MYSQLI_STORE_RESULT; long resultmode = MYSQLI_STORE_RESULT;
@ -833,7 +833,7 @@ PHP_FUNCTION(mysqli_reap_async_query)
MY_MYSQL *mysql; MY_MYSQL *mysql;
zval *mysql_link; zval *mysql_link;
MYSQLI_RESOURCE *mysqli_resource; MYSQLI_RESOURCE *mysqli_resource;
MYSQL_RES *result; MYSQL_RES *result = NULL;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
return; return;