MonetDB: label - merged with default

[Niels Nes via checkin-list]

Changeset: e770355f40e2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e770355f40e2
Branch: label
Log Message:

merged with default


diffs (28 lines):

diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries(mutils
 target_compile_definitions(mutils PRIVATE
   LIBMUTILS
   LIBGDK
+  LIBMAPI
   LIBMEROUTIL)
 
 set_target_properties(mutils
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -409,11 +409,11 @@ load_key(sql_trans *tr, sql_table *t, re
        nk->t = t;
 
        switch (ktype) {
-       case ckey:
+       case ckey: {
                str ch = (char*)store->table_api.table_fetch_value(rt_keys, 
find_sql_column(keys, "check"));
                if (!strNil(ch))
                        nk->check =_STRDUP(ch);
-               break;
+       }       break;
        case ukey:
        case unndkey:
        case pkey: {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org