Changeset: 42c4eb6427f4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42c4eb6427f4
Modified Files:
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_module.h
Branch: default
Log Message:

Backed out changeset 0ad1a0ec7921
This change causes 1 assertion failure and 30 crashes during
testing.  And then we didn't yet count the other failing tests...


diffs (36 lines):

diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -227,12 +227,7 @@ MCinitClientRecord(Client c, oid user, b
         * be aware, a user can introduce several modules 
         * that should be freed to avoid memory leaks */
        if (c->nspace) {
-               Module m, nm;
-               for( m = c->nspace; m!= mal_scope; m= m->outer){
-                       nm= m->outer;
-                       freeModule(m);
-                       m= nm;
-               }
+               freeModule(c->nspace);
                c->nspace = 0;
        }
 
diff --git a/monetdb5/mal/mal_module.h b/monetdb5/mal/mal_module.h
--- a/monetdb5/mal/mal_module.h
+++ b/monetdb5/mal/mal_module.h
@@ -24,7 +24,6 @@ typedef struct SCOPEDEF {
        str help;                       /* short description of module 
functionality*/
 } *Module, ModuleRecord;
 
-mal_export Module mal_scope;
 
 mal_export void     setModuleJump(str nme, Module cur);
 mal_export Module   newModule(Module scope, str nme);
@@ -45,7 +44,6 @@ mal_export char **getHelp(Module m, str 
 mal_export char **getHelpMatch(char *pat);
 mal_export void showHelp(Module m, str txt,stream *fs);
 
-
 #define getSubScope(N)  (*(N))
 
 #endif /* _MAL_SCOPE_H_ */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to