MonetDB: malparsing - Cleanup the geom at server reset

[Martin Kersten]

Changeset: 447ced0e2016 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=447ced0e2016
Modified Files:
        monetdb5/mal/mal.c
Branch: malparsing
Log Message:

Cleanup the geom at server reset


diffs (26 lines):

diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -146,6 +146,13 @@ void mserver_reset(int exit)
        MTIMEreset();
 #endif
 */
+#ifdef HAVE_GEOM
+#include "geom.h"
+       {
+               int ret;
+               geom_epilogue(&ret);
+       }
+#endif
        mal_factory_reset();
        mal_dataflow_reset();
        THRdel(mal_clients->mythread);
@@ -161,7 +168,7 @@ void mserver_reset(int exit)
        mal_clients->glb = 0;
        freeSymbol(mal_clients->curprg);
        mal_clients->curprg = 0;
-       if( mal_clients->usermodule && 
strcmp(mal_clients->usermodule->name,"user")==0)
+       //if( mal_clients->usermodule && 
strcmp(mal_clients->usermodule->name,"user")==0)
                freeModule(mal_clients->usermodule);
        mal_clients->usermodule = 0;
        mal_client_reset();
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list