MonetDB: default - Merge with Sep2022 branch.

[Sjoerd Mullender]

Changeset: 5bdcb31db76a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5bdcb31db76a
Modified Files:
        gdk/gdk_bat.c
Branch: default
Log Message:

Merge with Sep2022 branch.


diffs (53 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1797,7 +1797,7 @@ mskfnd(BAT *b, msk v)
 {
        BUN p, q;
 
-       if (* (msk *) v) {
+       if (v) {
                /* find a 1 value */
                for (p = 0, q = (BATcount(b) + 31) / 32; p < q; p++) {
                        if (((uint32_t *) b->theap->base)[p] != 0) {
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -166,11 +166,12 @@ loadLibrary(const char *filename, int fl
        const char *s;
        int idx;
        const char *mod_path = GDKgetenv("monet_mod_path");
-       int is_mod;
+       bool is_mod;
+       bool is_monetdb5 = strcmp(filename, "monetdb5") == 0;
 
-       is_mod = (strcmp(filename, "monetdb5") != 0 && strcmp(filename, 
"embedded") != 0);
+       is_mod = (!is_monetdb5 && strcmp(filename, "embedded") != 0);
 
-       if (lastfile == 0 && strcmp(filename, "monetdb5") != 0 && 
strcmp(filename, "embedded") != 0) { /* first load reference to local functions 
*/
+       if (lastfile == 0 && is_mod) { /* first load reference to local 
functions */
                str msg = loadLibrary("monetdb5", flag);
                if (msg != MAL_SUCCEED)
                        return msg;
@@ -208,9 +209,9 @@ loadLibrary(const char *filename, int fl
                        throw(LOADER, "loadLibrary", RUNTIME_LOAD_ERROR 
"Library filename path is too large");
 
 #ifdef __APPLE__
-               handle = mdlopen(nme, RTLD_NOW | RTLD_GLOBAL);
+               handle = mdlopen(is_monetdb5 ? NULL : nme, RTLD_NOW | 
RTLD_GLOBAL);
 #else
-               handle = dlopen(nme, RTLD_NOW | RTLD_GLOBAL);
+               handle = dlopen(is_monetdb5 ? NULL : nme, RTLD_NOW | 
RTLD_GLOBAL);
 #endif
                if (!handle) {
                        if (flag)
@@ -268,7 +269,8 @@ loadLibrary(const char *filename, int fl
        }
 
        if (handle == NULL) {
-               if (strcmp(filename, "monetdb5") != 0 && strcmp(filename, 
"sql") != 0
+               if (!is_monetdb5
+                       && strcmp(filename, "sql") != 0
                        && strcmp(filename, "generator") != 0
 #ifdef HAVE_GEOM
                        && strcmp(filename, "geom") != 0
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org