Changeset: 2392bc7948ed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2392bc7948ed
Modified Files:
MonetDB5/src/mal/mal_instruction.mx
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (28 lines):
diff -r 3bb99f7adc70 -r 2392bc7948ed MonetDB/src/gdk/gdk_storage.mx
--- a/MonetDB/src/gdk/gdk_storage.mx Tue Oct 12 09:27:07 2010 +0200
+++ b/MonetDB/src/gdk/gdk_storage.mx Tue Oct 12 17:35:55 2010 +0200
@@ -344,6 +344,12 @@
GDKsyserror("GDKload: cannot read:
name=%s, ext=%s, " SZFMT " bytes missing.\n", nme, ext ? ext : "", (size_t)
n_expected);
ret = NULL;
}
+#ifndef NDEBUG
+ /* just to make valgrind happy, we
+ initialize the whole thing */
+ if (ret && maxsize > size)
+ memset(ret + size, 0, maxsize - size);
+#endif
}
close(fd);
} else {
diff -r 3bb99f7adc70 -r 2392bc7948ed MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx Tue Oct 12 09:27:07 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx Tue Oct 12 17:35:55 2010 +0200
@@ -989,7 +989,7 @@
mb->stmt[mb->stop] = NULL;
}
if (p == NULL) {
- p = GDKzalloc(MAXARG * sizeof(p->maxarg) + sizeof(InstrRecord));
+ p = GDKzalloc(MAXARG * sizeof(p->argv[0]) +
sizeof(InstrRecord));
if (p == NULL)
return NULL;
p->maxarg = MAXARG;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
