svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h
branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt trunk/ext/mysqli/mysqli_libmysql.h trunk/ext/mysqli/tests/bug55582.phpt

andrey Tue, 06 Sep 2011 19:52:19 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316289 Log: Fix problems with the unbuffered set detection, for libmysql, which resulted in always true. Thanks Stas. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h U php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt U php/php-src/trunk/ext/mysqli/mysqli_libmysql.h U php/php-src/trunk/ext/mysqli/tests/bug55582.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h 2011-09-06 19:51:35 UTC (rev 316288) +++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h 2011-09-06 19:52:19 UTC (rev 316289) @@ -29,8 +29,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) -#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) Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h 2011-09-06 19:51:35 UTC (rev 316288) +++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h 2011-09-06 19:52:19 UTC (rev 316289) @@ -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) Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt 2011-09-06 19:51:35 UTC (rev 316288) +++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt 2011-09-06 19:52:19 UTC (rev 316289) @@ -5,7 +5,6 @@ require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); -if(!$IS_MYSQLND) die("skip This bug is for mysqlnd only"); ?> --FILE-- <?php Modified: php/php-src/trunk/ext/mysqli/mysqli_libmysql.h =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli_libmysql.h 2011-09-06 19:51:35 UTC (rev 316288) +++ php/php-src/trunk/ext/mysqli/mysqli_libmysql.h 2011-09-06 19:52:19 UTC (rev 316289) @@ -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) Modified: php/php-src/trunk/ext/mysqli/tests/bug55582.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/bug55582.phpt 2011-09-06 19:51:35 UTC (rev 316288) +++ php/php-src/trunk/ext/mysqli/tests/bug55582.phpt 2011-09-06 19:52:19 UTC (rev 316289) @@ -5,7 +5,6 @@ require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); require_once("connect.inc"); -if(!$IS_MYSQLND) die("skip This bug is for mysqlnd only"); ?> --FILE-- <?php