- Revert bad fix for bug #49122 and only enable this when mysqlnd is used

1 files changed, 3 insertions, 4 deletions

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 05ad91be0f..38bf9ae946 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1483,8 +1483,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)
@@ -1497,7 +1496,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));
 }
 /* }}} */
 
@@ -1513,7 +1512,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");