Changeset: 5acfd732676e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5acfd732676e
Modified Files:
        monetdb5/mal/mal_prelude.c
        monetdb5/modules/atoms/CMakeLists.txt
Branch: nilmask
Log Message:

v1 sha256 atom needs a no NULL column


diffs (29 lines):

diff --git a/monetdb5/mal/mal_prelude.c b/monetdb5/mal/mal_prelude.c
--- a/monetdb5/mal/mal_prelude.c
+++ b/monetdb5/mal/mal_prelude.c
@@ -130,9 +130,11 @@ addAtom( mel_atom *atoms)
                        BATatoms[i] = BATatoms[tpe];
                        strcpy_len(BATatoms[i].name, atoms->name, 
sizeof(BATatoms[i].name));
                        BATatoms[i].storage = ATOMstorage(tpe);
-               } else  { /* cannot overload void atoms */
+               } else { /* cannot overload void atoms */
                        BATatoms[i].storage = i;
                        BATatoms[i].linear = false;
+                       if (atoms->size)
+                               BATatoms[i].size = atoms->size;
                }
                if (atoms->del)
                        BATatoms[i].atomDel = atoms->del;
diff --git a/monetdb5/modules/atoms/CMakeLists.txt 
b/monetdb5/modules/atoms/CMakeLists.txt
--- a/monetdb5/modules/atoms/CMakeLists.txt
+++ b/monetdb5/modules/atoms/CMakeLists.txt
@@ -24,7 +24,8 @@ target_sources(atoms
   inet.c
   identifier.c
   xml.c xml.h
-  batxml.c)
+  batxml.c
+  sha256.c)
 
 target_include_directories(atoms
   PRIVATE
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to