diff options
| author | Andrey Hristov <andrey@php.net> | 2011-09-06 19:52:19 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2011-09-06 19:52:19 +0000 |
| commit | 222c5b4a9ccbfb878f34be96dcb1bce603f1ef47 (patch) | |
| tree | ea463a4f3b4d42d38e17a58a5935d2cd11168ce5 /ext/mysqli/mysqli_libmysql.h | |
| parent | a226fcc15e2aaff2e066d1fc16b2193f63fdfc8b (diff) | |
| download | php-git-222c5b4a9ccbfb878f34be96dcb1bce603f1ef47.tar.gz | |
Fix problems with the unbuffered set detection, for libmysql, which resulted
in always true. Thanks Stas.
Diffstat (limited to 'ext/mysqli/mysqli_libmysql.h')
| -rw-r--r-- | ext/mysqli/mysqli_libmysql.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_libmysql.h b/ext/mysqli/mysqli_libmysql.h index 98e18fcfcd..c3f6de583b 100644 --- a/ext/mysqli/mysqli_libmysql.h +++ b/ext/mysqli/mysqli_libmysql.h @@ -29,8 +29,8 @@ #define MYSQLND_OPT_INT_AND_YEAR_AS_INT 201 /* 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_result_is_unbuffered_and_not_everything_is_fetched(r) (((r)->handle && (r)->handle->status == MYSQL_STATUS_USE_RESULT) || ((r)->data == NULL)) +#define mysqli_result_is_unbuffered(r) ((r)->handle && (r)->handle->status == MYSQL_STATUS_USE_RESULT && (r)->data == NULL) +#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r) mysqli_result_is_unbuffered(r) #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) |