Changeset: 28fc0fc128b4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/28fc0fc128b4
Modified Files:
        sql/storage/store.c
Branch: nested
Log Message:

Initialize lock.  Merge conflict fix.


diffs (11 lines):

diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4110,6 +4110,7 @@ sql_trans_create_column_intern(sql_colum
                }
        }
        if (!isDeclaredTable(t)) {
+               obj_lock_init(&col->lock, 'c', col->base.id);
                char *strnil = (char*)ATOMnilptr(TYPE_str);
                int digits = type_digits(&col->type);
                if ((res = store->table_api.table_insert(tr, syscolumn, 
&col->base.id, &col->base.name, &col->type.type->base.name,
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to