diff options
| author | Jani Taskinen <jani@php.net> | 2009-08-02 01:07:38 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-08-02 01:07:38 +0000 |
| commit | 65db89ffbe22b98b3b9923080df61d149db1a85b (patch) | |
| tree | 18be000539acfc0b38863caa528fb3d7831d8ff5 | |
| parent | 7af02a4c3b576e322f90cd1748a36c8c0bceb1d5 (diff) | |
| download | php-git-65db89ffbe22b98b3b9923080df61d149db1a85b.tar.gz | |
- Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile with --with-mysqli and MySQL 6.0)
| -rw-r--r-- | ext/mysqli/config.m4 | 2 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 index c69b16a819..2c1cf78ecc 100644 --- a/ext/mysqli/config.m4 +++ b/ext/mysqli/config.m4 @@ -62,7 +62,7 @@ elif test "$PHP_MYSQLI" != "no"; then $MYSQLI_LIBLINE ]) dnl - dnl Check the library for mysql_stmt_store_result + dnl Check the library for mysql_stmt_next_result dnl PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_stmt_next_result, [ diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 2bc4358ca7..34564db2e4 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -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(mysqlnd_stmt_more_results(stmt->stmt)); + RETURN_BOOL(mysql_stmt_more_results(stmt->stmt)); } /* }}} */ @@ -1566,13 +1566,13 @@ PHP_FUNCTION(mysqli_stmt_next_result) { } MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt", MYSQLI_STATUS_VALID); - if (!mysqlnd_stmt_more_results(stmt->stmt)) { + if (!mysql_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"); } - RETURN_BOOL(!mysqlnd_stmt_next_result(stmt->stmt)); + RETURN_BOOL(!mysql_stmt_next_result(stmt->stmt)); } /* }}} */ #endif |