MonetDB: iso - Fixing the merge

[Pedro Ferreira]

Changeset: ff6ec6829197 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ff6ec6829197
Modified Files:
        sql/storage/bat/bat_table.c
        sql/storage/store.c
Branch: iso
Log Message:

Fixing the merge


diffs (24 lines):

diff --git a/sql/storage/bat/bat_table.c b/sql/storage/bat/bat_table.c
--- a/sql/storage/bat/bat_table.c
+++ b/sql/storage/bat/bat_table.c
@@ -220,7 +220,7 @@ table_insert(sql_trans *tr, sql_table *t
                store->storage_api.claim_tab(tr, t, 1, &offset, NULL):
                store->storage_api.key_claim_tab(tr, t, 1, &offset, NULL);
        if (ok != LOG_OK)
-               return t->bootstrap?LOG_ERR:LOG_CONFLICT;
+               return ok;
        for (; n; n = n->next) {
                sql_column *c = n->data;
                val = va_arg(va, void *);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -3612,7 +3612,7 @@ sql_trans_valid(sql_trans *tr)
                        pl *p = n->data;
                        sql_column *c = p->c;
 
-                       if (c->t && isTable(c->t) && !isNew(c->t) && 
!isTempTable(c->t)) {
+                       if (c->t && isTable(c->t) && !isNew(c) && 
!isTempTable(c->t)) {
                                if ((ok = store->storage_api.tab_validate(tr, 
c->t, 0)))
                                        break;
                        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list