diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-07-03 16:58:20 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-07-03 16:58:20 +0200 |
| commit | 631bb27dcacf625e35f6dacc5e8df0b45624531a (patch) | |
| tree | 394a8755c2d4eb876ed707fd1c48006859d262d7 /ext/mysqli/mysqli_nonapi.c | |
| parent | 5324416b6514b6de53e7de269bc18b5807701051 (diff) | |
| parent | 0265c2d961aa99e00361d6ab0f845dc1e8782558 (diff) | |
| download | php-git-631bb27dcacf625e35f6dacc5e8df0b45624531a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/acinclude.m4
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 398c15919b..c24b974de8 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -562,7 +562,7 @@ PHP_FUNCTION(mysqli_query) MY_MYSQL *mysql; zval *mysql_link; MYSQLI_RESOURCE *mysqli_resource; - MYSQL_RES *result; + MYSQL_RES *result = NULL; char *query = NULL; int query_len; long resultmode = MYSQLI_STORE_RESULT; @@ -833,7 +833,7 @@ PHP_FUNCTION(mysqli_reap_async_query) MY_MYSQL *mysql; zval *mysql_link; 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) { return; |