MonetDB: mdbl-mal - Move startup of SQL MAL API to mserver5.c

[Martin Kersten]

Changeset: c26bc25e064b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c26bc25e064b
Modified Files:
        sql/backends/monet5/sql_scenario.c
        tools/mserver/mserver5.c
Branch: mdbl-mal
Log Message:

Move startup of SQL MAL API to mserver5.c


diffs (32 lines):

diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -388,7 +388,6 @@ SQLinit(Client c)
 #ifdef NEED_MT_LOCK_INIT
        MT_lock_init(&sql_contextLock, "sql_contextLock");
 #endif
-       sqlEmbeddedBoot(c);
 
        MT_lock_set(&sql_contextLock);
        be_funcs = (backend_functions) {
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -19,6 +19,7 @@
 #include "mal_authorize.h"
 #include "msabaoth.h"
 #include "mutils.h"
+#include "../../sql/backends/monet5/sql_embedded.h"
 
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
@@ -695,6 +696,9 @@ main(int argc, char **av)
                free(err);
        }
 
+       // Now it is time to also bootstrap the SQL part
+       sqlEmbeddedBoot(mal_clients);
+
        free(monet_script);
 #ifdef HAVE_CONSOLE
        if (!monet_daemon) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list