Changeset: 432e8b891f90 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=432e8b891f90 Modified Files: sql/server/sql_mvc.c Branch: HTM Log Message:
Avoid mixing declarations and code diffs (17 lines): diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c --- a/sql/server/sql_mvc.c +++ b/sql/server/sql_mvc.c @@ -302,12 +302,11 @@ mvc_commit(mvc *m, int chain, const char int mvc_precommit(mvc *m, int chain, const char *name, long id) { + int result = SQL_OK;//, wait = 0; sql_trans *tr = m->session->tr; // set CPaaS HTM id tr->htm_id = id; - int result = SQL_OK;//, wait = 0; - if ((result = mvc_commit_prepare(m, chain, name, tr)) != SQL_OK) { store_unlock(); return 0; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list