1 files changed, 7 insertions, 2 deletions
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;
+		}
 	}
 }