Changeset: b26ee19d5589 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b26ee19d5589 Modified Files: sql/backends/monet5/sql.c Branch: nospare Log Message:
output errors on write conflicts diffs (19 lines): diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c --- a/sql/backends/monet5/sql.c +++ b/sql/backends/monet5/sql.c @@ -1813,11 +1813,15 @@ mvc_modify_prep(Client cntxt, MalBlkPtr if (c == NULL) throw(SQL, "sql.modify_prep", SQLSTATE(42S02) "Column missing %s.%s.%s", sname, tname, cname); *cookie_out = colprep(m->session->tr, c); + if (!(*cookie_out)) + throw(SQL, "sql.modify_prep", SQLSTATE(42000) "Transaction conflict on %s.%s.%s", sname, tname, cname); } else { sql_idx *i = mvc_bind_idx(m, s, cname + 1); if (i == NULL) throw(SQL, "sql.modify_prep", SQLSTATE(42S02) "Index missing %s.%s.%s", sname, tname, cname); *cookie_out = idxprep(m->session->tr, i); + if (!(*cookie_out)) + throw(SQL, "sql.modify_prep", SQLSTATE(42000) "Transaction conflict on %s.%s.%s", sname, tname, cname); } } _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list