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 c017e97920ab025414eee71e293f1ba6f44b1b4e..f4544a3c0f93421bf46d08655fe2043fc63d4693 100755 (executable)
--- 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;
+               }
        }
 }