summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli_api.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2011-09-05 15:29:45 +0000
committerAndrey Hristov <andrey@php.net>2011-09-05 15:29:45 +0000
commit4325a8bffcf6768297a8fa186bbace4f879ba951 (patch)
treece9c45b51014b7809ac37aabe97178b7bc21d330 /ext/mysqli/mysqli_api.c
parent67872cf7a90828e9424c2cca7271715e6c710339 (diff)
downloadphp-git-4325a8bffcf6768297a8fa186bbace4f879ba951.tar.gz
Fix for Bug #55582 mysqli_num_rows() returns always 0 for unbuffered, when mysqlnd is used
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
-rw-r--r--ext/mysqli/mysqli_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 041875480c..e20d963fbb 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1612,7 +1612,7 @@ PHP_FUNCTION(mysqli_num_rows)
}
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
- if (mysqli_result_is_unbuffered(result)) {
+ if (mysqli_result_is_unbuffered_and_not_everything_is_fetched(result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function cannot be used with MYSQL_USE_RESULT");
RETURN_LONG(0);
}