Changeset: 8c0a7dc23f11 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c0a7dc23f11
Modified Files:
monetdb5/mal/Tests/tst274.stable.out
monetdb5/mal/mal_box.c
monetdb5/modules/mal/const.mal
Branch: default
Log Message:
Merge with Oct2012 branch.
diffs (65 lines):
diff --git a/monetdb5/mal/Tests/tst274.stable.out
b/monetdb5/mal/Tests/tst274.stable.out
--- a/monetdb5/mal/Tests/tst274.stable.out
+++ b/monetdb5/mal/Tests/tst274.stable.out
@@ -66,7 +66,7 @@ end main;
[ 1@0, 0 ]
[ 2@0, 0 ]
[ 3@0, 0 ]
-[ 4@0, 120000 ]
+[ 4@0, 0 ]
[ 5@0, 0 ]
[ 6@0, 0 ]
#-----------------#
@@ -88,7 +88,7 @@ end main;
[ 1@0, 0, 120000 ]
[ 2@0, 0, 0 ]
[ 3@0, 0, 0 ]
-[ 4@0, 120000, 120000 ]
+[ 4@0, 0, 120000 ]
[ 5@0, 0, 120000 ]
[ 6@0, 0, 0 ]
diff --git a/monetdb5/mal/mal_box.c b/monetdb5/mal/mal_box.c
--- a/monetdb5/mal/mal_box.c
+++ b/monetdb5/mal/mal_box.c
@@ -358,12 +358,15 @@ destroyBox(str name)
for (i = j = 0; i < topbox; i++) {
if (idcmp(malbox[i]->name, name) == 0) {
freeMalBlk(malbox[i]->sym);
+ malbox[i]->sym = NULL;
if ( malbox[i]->val)
freeStack(malbox[i]->val);
+ malbox[i]->val = NULL;
boxfile = boxFileName(malbox[i], 0);
unlink(boxfile);
GDKfree(boxfile);
GDKfree(malbox[i]->name);
+ malbox[i]->name = NULL;
MT_lock_destroy(&malbox[i]->lock);
} else {
if (j < i)
@@ -371,6 +374,8 @@ destroyBox(str name)
j++;
}
}
+ for (i = j; i < topbox; i++)
+ malbox[i] = NULL;
topbox = j;
MT_lock_unset(&mal_contextLock, "destroyBox");
}
diff --git a/monetdb5/modules/mal/const.mal b/monetdb5/modules/mal/const.mal
--- a/monetdb5/modules/mal/const.mal
+++ b/monetdb5/modules/mal/const.mal
@@ -48,10 +48,10 @@ comment "Get the string representation o
pattern discard(name:any_1) :void
address CSTdiscard
comment "Release the const from the box.";
-pattern newIterator()(:lng,:str)
+pattern newIterator()(:oid,:str)
address CSTnewIterator
comment "Locate next element in the box.";
-pattern hasMoreElements()(:lng,:str)
+pattern hasMoreElements()(:oid,:str)
address CSThasMoreElements
comment "Locate next element in the box.";
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
