diff options
| author | Andrey Hristov <andrey@php.net> | 2010-05-18 10:39:26 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-05-18 10:39:26 +0000 |
| commit | 7dd13d56ccd811c45245b0fb2759dc856dd90b80 (patch) | |
| tree | 351e83c2e0414536496d20f0f2fedd881f49178d /ext/mysqli/mysqli_libmysql.h | |
| parent | 50cda403b1cfc71c84536a0f4dad751cf049c4e5 (diff) | |
| download | php-git-7dd13d56ccd811c45245b0fb2759dc856dd90b80.tar.gz | |
Add iterator to mysqli_result. Works both for :
- USE_RESULT, can be iterated only once, kind of forward iterator
- STORE_RESULT, can be iterated multiple times
Diffstat (limited to 'ext/mysqli/mysqli_libmysql.h')
| -rw-r--r-- | ext/mysqli/mysqli_libmysql.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/mysqli/mysqli_libmysql.h b/ext/mysqli/mysqli_libmysql.h index 8e0c735b1a..642a56ae53 100644 --- a/ext/mysqli/mysqli_libmysql.h +++ b/ext/mysqli/mysqli_libmysql.h @@ -1,9 +1,9 @@ /* - ---------------------------------------------------------------------- - | PHP Version 6 | - ---------------------------------------------------------------------- - | Copyright (c) 2007 The PHP Group | - ---------------------------------------------------------------------- + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2010 The PHP Group | + +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | @@ -11,12 +11,11 @@ | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | - ---------------------------------------------------------------------- - | Authors: Georg Richter <georg@mysql.com> | - | Andrey Hristov <andrey@mysql.com> | - | Ulf Wendel <uwendel@mysql.com> | - ---------------------------------------------------------------------- - + +----------------------------------------------------------------------+ + | Authors: Georg Richter <georg@php.net> | + | Andrey Hristov <andrey@php.net> | + | Ulf Wendel <uw@php.net> | + +----------------------------------------------------------------------+ */ #ifndef MYSQLI_LIBMYSQL_H @@ -29,7 +28,8 @@ #define MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE 200 #define MYSQLND_OPT_INT_AND_YEAR_AS_INT 201 -#define mysqli_result_is_unbuffered(r) ((r)->handle && (r)->handle->status == MYSQL_STATUS_USE_RESULT) +/* r->data should be always NULL, at least in recent libmysql versions, the status changes once data is read*/ +#define mysqli_result_is_unbuffered(r) (((r)->handle && (r)->handle->status == MYSQL_STATUS_USE_RESULT) || ((r)->data == NULL)) #define mysqli_server_status(c) (c)->server_status #define mysqli_stmt_get_id(s) ((s)->stmt_id) #define mysqli_stmt_warning_count(s) mysql_warning_count((s)->mysql) |