archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Jani Taskinen 2009-08-04 14:49:33 +00:00
parent b053fb5af6
commit b312b3af2e
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/mysqli/mysqli_api.c
View file

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