jani Tue, 04 Aug 2009 14:51:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286808
Log:
Merge from PHP_5_3
Changed paths:
U php/php-src/trunk/ext/mysqli/mysqli_api.c
Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_api.c 2009-08-04 14:49:33 UTC (rev
286807)
+++ php/php-src/trunk/ext/mysqli/mysqli_api.c 2009-08-04 14:51:29 UTC (rev
286808)
@@ -1537,7 +1537,7 @@
/* }}} */
-#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 @@
}
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 @@
}
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");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
