MonetDB: HTM - Merge with 2PC branch.

[Sjoerd Mullender]

Changeset: b72363d0779e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b72363d0779e
Modified Files:
        sql/server/sql_mvc.c
        sql/server/sql_mvc.h
Branch: HTM
Log Message:

Merge with 2PC branch.


diffs (39 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
@@ -283,7 +283,7 @@ sql_trans_deref( sql_trans *tr )
        return tr->parent;
 }
 
-int
+static int
 mvc_commit_prepare(mvc *m, int chain, const char *name, sql_trans *tr) {
        sql_trans *cur = m->session->tr, *ctr;
        int result = SQL_OK;//, wait = 0;
@@ -382,7 +382,6 @@ mvc_commit(mvc *m, int chain, const char
        int result = SQL_OK;//, wait = 0;
 
        if ((result = mvc_commit_prepare(m, chain, name, tr)) != SQL_OK) {
-               store_unlock();
                return 0;
        }
 
@@ -416,7 +415,6 @@ mvc_precommit(mvc *m, int chain, const c
        tr->precommit_id = id;
 
        if ((result = mvc_commit_prepare(m, chain, name, tr)) != SQL_OK) {
-               store_unlock();
                return 0;
        }
 
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -150,7 +150,6 @@ extern int mvc_debug_on(mvc *m, int flag
 #define has_snapshots(tr) ((tr) && (tr)->parent && (tr)->parent->parent)
 
 extern void mvc_trans(mvc *c);
-extern int mvc_commit_prepare(mvc *m, int chain, const char *name, sql_trans 
*tr);
 extern void mvc_commit_finish(mvc *m, int chain, const char *name);
 extern int mvc_commit(mvc *c, int chain, const char *name);
 extern int mvc_precommit(mvc *m, int chain, const char *name, lng id);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list