MonetDB: default - Merge with monetdbe-proxy.

[Aris Koning]

Changeset: ed0392ec7dc3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed0392ec7dc3
Branch: default
Log Message:

Merge with monetdbe-proxy.


diffs (20 lines):

diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -644,6 +644,7 @@ static bool urls_matches(const char* l, 
 
 static int
 monetdbe_open_remote(monetdbe_database_internal *mdbe, char *url, 
monetdbe_options *opts) {
+       assert(opts);
 
        monetdbe_remote* remote = opts->remote;
        if (!remote) {
@@ -724,7 +725,7 @@ monetdbe_open(monetdbe_database *dbhdl, 
        mdbe->msg = NULL;
        mdbe->c = NULL;
 
-       bool is_remote = opts->remote != NULL;
+       bool is_remote = (opts && (opts->remote != NULL));
        if (!monetdbe_embedded_initialized) {
                /* When used as a remote mapi proxy,
                 * it is still necessary to have an initialized monetdbe. E.g. 
for BAT life cycle management.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list