# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1388971209 18000
# Node ID 1802eb00a0ae01c5b5f3107d475307d38e5e9151
# Parent  0992323fa264f700dc124755e94efd5e4f34e84e
MySQL: catch deadlocks during queries

diff -r 0992323fa264 -r 1802eb00a0ae src/mysql.sml
--- a/src/mysql.sml	Sat Jan 04 19:02:14 2014 -0500
+++ b/src/mysql.sml	Sun Jan 05 20:20:09 2014 -0500
@@ -854,11 +854,20 @@
          newline,
          newline,
 
-         string "if (mysql_stmt_execute(stmt)) uw_error(ctx, FATAL, \"",
-         string (ErrorMsg.spanToString loc),
-         string ": Error executing query: %s\\n%s\", ",
-         query,
-         string ", mysql_error(conn->conn));",
+         string "if (mysql_stmt_execute(stmt)) {",
+         newline,
+         box [string "if (mysql_errno(conn->conn) == 1213)",
+              newline,
+              box [string "uw_error(ctx, UNLIMITED_RETRY, \"Deadlock detected\");",
+                   newline],
+              newline,
+              string "uw_error(ctx, FATAL, \"",
+              string (ErrorMsg.spanToString loc),
+              string ": Error executing query: %s\\n%s\", ",
+              query,
+              string ", mysql_error(conn->conn));",
+              newline],
+         string "}",
          newline,
          newline,