mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-10 13:03:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge from PHP_5_3

Browse Source
This commit is contained in:
Jani Taskinen 2009-08-04 14:51:29 +00:00
parent 116abdde65
commit 90f148ab99
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/mysqli/mysqli_api.c
View File

@ -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");