diff --git a/mx_mysql.c b/mx_mysql.c
index ca983b0..2894ca7 100644
--- a/mx_mysql.c
+++ b/mx_mysql.c
@@ -262,14 +262,13 @@ static int mx__mysql_stmt_bind_result(struct mx_mysql_stmt *stmt)
 
 static int mx__mysql_stmt_execute(struct mx_mysql_stmt *stmt)
 {
-    int res;
-
     assert(stmt);
     assert(stmt->stmt);
 
-    res = mysql_stmt_execute(stmt->stmt);
-    if (res == 0)
-        return 0;
+    do {
+        if (mysql_stmt_execute(stmt->stmt) == 0)
+            return 0;
+    } while (mysql_stmt_errno(stmt->stmt) == ER_LOCK_DEADLOCK);
 
     mx_mysql_save_error(mysql_stmt_error(stmt->stmt));
 
diff --git a/mxqkill.c b/mxqkill.c
index 2615866..6d5f21f 100644
--- a/mxqkill.c
+++ b/mxqkill.c
@@ -461,5 +461,4 @@ int main(int argc, char *argv[])
 
     mx_mysql_finish(&mysql);
     mx_log_info("MySQL: Connection to database closed.");
-    return 1;
 }