MonetDB: Jun2020 - small cleanup

[Niels Nes]

Changeset: 0308064519ac for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0308064519ac
Modified Files:
        sql/server/sql_mvc.c
Branch: Jun2020
Log Message:

small cleanup


diffs (21 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
@@ -699,15 +699,14 @@ build up the hash (not copied in the tra
 str
 mvc_rollback(mvc *m, int chain, const char *name, bool disabling_auto_commit)
 {
-       sql_trans *tr = m->session->tr;
        str msg;
 
        TRC_DEBUG(SQL_TRANS, "Rollback: %s\n", (name) ? name : "");
-       assert(tr);
-       assert(m->session->tr->active); /* only abort an active transaction */
        (void) disabling_auto_commit;
 
        store_lock();
+       sql_trans *tr = m->session->tr;
+       assert(m->session->tr && m->session->tr->active);       /* only abort 
an active transaction */
        if (m->qc) 
                qc_clean(m->qc, false);
        stack_pop_until(m, NR_GLOBAL_VARS);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list