From: Jani Taskinen <jani@php.net>
Date: Tue, 4 Aug 2009 14:51:29 +0000 (+0000)
Subject: Merge from PHP_5_3
X-Git-Tag: php-5.4.0alpha1~191^2~2853
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90f148ab99cb76cab422404af69052e2179017b6;p=php

Merge from PHP_5_3
---

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 34564db2e4..93f5aaad13 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1537,7 +1537,7 @@ PHP_FUNCTION(mysqli_next_result) {
 /* }}} */
 
 
-#ifdef HAVE_STMT_NEXT_RESULT
+#if defined(HAVE_STMT_NEXT_RESULT) && defined(MYSQLI_USE_MYSQLND)
 /* {{{ proto bool mysqli_stmt_next_result(object link)
    check if there any more query results from a multi query */
 PHP_FUNCTION(mysqli_stmt_more_results)
@@ -1550,7 +1550,7 @@ PHP_FUNCTION(mysqli_stmt_more_results)
 	}
 	MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt", MYSQLI_STATUS_VALID);
 
-	RETURN_BOOL(mysql_stmt_more_results(stmt->stmt));
+	RETURN_BOOL(mysqlnd_stmt_more_results(stmt->stmt));
 }
 /* }}} */
 
@@ -1566,7 +1566,7 @@ PHP_FUNCTION(mysqli_stmt_next_result) {
 	}
 	MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt", MYSQLI_STATUS_VALID);
 
-	if (!mysql_stmt_more_results(stmt->stmt)) {
+	if (!mysqlnd_stmt_more_results(stmt->stmt)) {
 		php_error_docref(NULL TSRMLS_CC, E_STRICT, "There is no next result set. "
 						"Please, call mysqli_stmt_more_results()/mysqli_stmt::more_results() to check "
 						"whether to call this function/method");