Merge from PHP_5_3

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 34564db2e4269aa0d78740cd431f53ebd964075f..93f5aaad13bfb20f59685261a52bd12509695725 100644 (file)
--- 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");