MonetDB: default - merge with Feb2013

[Niels Nes]

Changeset: 1f651cf3e2ec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f651cf3e2ec
Modified Files:
        sql/storage/store.c
Branch: default
Log Message:

merge with Feb2013


diffs (22 lines):

diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2775,13 +2775,16 @@ rollforward_trans(sql_trans *tr, int mod
                ok = rollforward_changeset_updates(tr, &tr->schemas, 
&tr->parent->schemas, (sql_base *) tr->parent, (rfufunc) 
&rollforward_update_schema, (rfcfunc) &rollforward_create_schema, (rfdfunc) 
&rollforward_drop_schema, (dupfunc) &schema_dup, mode);
        if (mode == R_APPLY) {
                if (tr->parent == gtrans) {
-                       gtrans->stime = tr->stime;
-                       gtrans->wstime = tr->wstime;
+                       if (gtrans->stime < tr->stime)
+                               gtrans->stime = tr->stime;
+                       if (gtrans->wstime < tr->wstime)
+                               gtrans->wstime = tr->wstime;
                        
                        if (tr->schema_updates) 
                                schema_number++;
                }
                tr->wtime = tr->rtime = 0;
+               assert(gtrans->wstime == gtrans->wtime);
        }
        return ok;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list