[packages/php.git] / php-5.3.7-bug-53782.patch

--- PHP_5_3/ext/pdo_mysql/mysql_statement.c	2011/05/16 15:36:12	311087
+++ PHP_5_3/ext/pdo_mysql/mysql_statement.c	2011/05/16 15:37:39	311088
@@ -656,7 +656,11 @@
 #endif /* PDO_USE_MYSQLND */
 
 	if ((S->current_data = mysql_fetch_row(S->result)) == NULL) {
-		if (mysql_errno(S->H->server)) {
+#if PDO_USE_MYSQLND
+		if (S->result->unbuf && !S->result->unbuf->eof_reached && mysql_errno(S->H->server)) {
+#else
+		if (!S->result->eof && mysql_errno(S->H->server)) {
+#endif
 			pdo_mysql_error_stmt(stmt);
 		}
 		PDO_DBG_RETURN(0);
Commit	Line	Data
fb98beff ER	1	--- PHP_5_3/ext/pdo_mysql/mysql_statement.c 2011/05/16 15:36:12 311087
	2	+++ PHP_5_3/ext/pdo_mysql/mysql_statement.c 2011/05/16 15:37:39 311088
	3	@@ -656,7 +656,11 @@
	4	#endif /* PDO_USE_MYSQLND */
	5
	6	if ((S->current_data = mysql_fetch_row(S->result)) == NULL) {
	7	- if (mysql_errno(S->H->server)) {
	8	+#if PDO_USE_MYSQLND
	9	+ if (S->result->unbuf && !S->result->unbuf->eof_reached && mysql_errno(S->H->server)) {
	10	+#else
	11	+ if (!S->result->eof && mysql_errno(S->H->server)) {
	12	+#endif
	13	pdo_mysql_error_stmt(stmt);
	14	}
	15	PDO_DBG_RETURN(0);