Changeset: 209f7fa5b07b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=209f7fa5b07b
Added Files:
sql/benchmarks/tpch/trace.sql
Modified Files:
gdk/gdk_heap.c
Branch: Feb2013
Log Message:
fix crash in HEAPfree
diffs (26 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -498,7 +498,7 @@ HEAPextend(Heap *h, size_t size)
int
HEAPshrink(Heap *h, size_t size)
{
- char *p;
+ char *p = NULL;
assert(size >= h->free);
assert(size <= h->size);
@@ -519,6 +519,7 @@ HEAPshrink(Heap *h, size_t size)
}
/* shrink memory mapped file */
GDKfilepath(path, BATDIR, nme, ext);
+ size = MAX(size, MT_pagesize()); /* at least one page */
size = (size + MT_pagesize() - 1) & ~(MT_pagesize() - 1);
if (size >= h->size) {
/* don't grow */
diff --git a/sql/benchmarks/tpch/trace.sql b/sql/benchmarks/tpch/trace.sql
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/tpch/trace.sql
@@ -0,0 +1,1 @@
+trace
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
