MonetDB: HTM - Avodid mixing declaration and code

[Dimitar Nedev]

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

Avodid mixing declaration and code


diffs (19 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
@@ -334,12 +334,12 @@ mvc_precommit(mvc *m, int chain, const c
 
 int
 mvc_persistcommit(mvc *m, int chain, const char *name, long id) {
-       /* used the parent, since we semi-rolled forward in mvc_commit_prepare 
*/
-       sql_trans *tr = m->session->tr->parent;
+       int result = SQL_OK;//, wait = 0;
+       /* use the parent, since we semi-rolled forward in mvc_commit_prepare */
+       sql_trans *tr = m->session->tr;
        // set CPaaS HTM id
        tr->htm_id = id;
 
-       int result = SQL_OK;//, wait = 0;
 
        store_lock();
        // find the transaction
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list