diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2016-08-05 20:06:17 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-08-05 20:06:17 -0400 |
| commit | c921d0df325c803fed8c7742eb088cb3d030d541 (patch) | |
| tree | 16d374660aa9adb92c2f08317a20d61ae995ef9a /src/mysql.sml | |
| parent | a3e471e933945dcfb54873cb20c691a193b55671 (diff) | |
| parent | bd6f549a527856db3878f1586c6666646a45d8ee (diff) | |
Merge branch 'upstream' into dfsg_clean20160805+dfsg
Diffstat (limited to 'src/mysql.sml')
| -rw-r--r-- | src/mysql.sml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mysql.sml b/src/mysql.sml index 539428f6..52e4921e 100644 --- a/src/mysql.sml +++ b/src/mysql.sml @@ -867,7 +867,7 @@ fun queryCommon {loc, query, cols, doCols} = newline, string "uw_error(ctx, FATAL, \"", string (ErrorMsg.spanToString loc), - string ": Error reseting statement: %s\\n%s\", ", + string ": Error resetting statement: %s\\n%s\", ", query, string ", mysql_error(conn->conn));", newline], @@ -931,7 +931,7 @@ fun queryCommon {loc, query, cols, doCols} = string "if (mysql_stmt_reset(stmt)) uw_error(ctx, FATAL, \"", string (ErrorMsg.spanToString loc), - string ": Error reseting statement: %s\\n%s\", ", + string ": Error resetting statement: %s\\n%s\", ", query, string ", mysql_error(conn->conn));", newline, |