From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 14 Sep 2005 15:34:58 +0000 (+0000)
Subject: MFH: Fix error detection for queries such as OPTIMIZE
X-Git-Tag: php-5.1.0RC2~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=766e4b3c15a307290194d76347aec3948e5d14bb;p=php

MFH: Fix error detection for queries such as OPTIMIZE
---

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index c017e97920..f4544a3c0f 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -234,8 +234,13 @@ static long mysql_handle_doer(pdo_dbh_t *dbh, const char *sql, long sql_len TSRM
 		pdo_mysql_error(dbh);
 		return -1;
 	} else {
-		my_ulonglong c= mysql_affected_rows(H->server);
-		return c != (my_ulonglong)-1 ? c:(pdo_mysql_error(dbh),-1); 
+		my_ulonglong c = mysql_affected_rows(H->server);
+		if (c != (my_ulonglong) -1) {
+			pdo_mysql_error(dbh);
+			return (H->einfo.errcode ? -1 : 0);
+		} else {
+			return c;
+		}
 	}
 }