Update of /cvsroot/monetdb/MonetDB4/src/monet
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17968/src/monet
Modified Files:
monet_interpreter.mx monet_multiplex.mx
Log Message:
propagated changes of Monday Feb 11 2008 - Tuesday Feb 12 2008
from the MonetDB_4-22 branch to the development trunk
Index: monet_interpreter.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/monet/monet_interpreter.mx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- monet_interpreter.mx 8 Feb 2008 22:36:06 -0000 1.14
+++ monet_interpreter.mx 12 Feb 2008 18:46:13 -0000 1.15
@@ -2546,11 +2546,11 @@
void
onlineProfilerEvent(char *caller, lng clk, lng ticks, struct tms *timer,
YYSTREE lt)
{
- static struct mallinfo prevMalloc;
+ static struct Mallinfo prevMalloc;
static struct rusage prevUsage;
static int eventcounter;
struct tms newTms;
- struct mallinfo infoMalloc;
+ struct Mallinfo infoMalloc;
struct rusage infoUsage;
char namebuf[1024];
Index: monet_multiplex.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/monet/monet_multiplex.mx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- monet_multiplex.mx 8 Feb 2008 22:36:06 -0000 1.9
+++ monet_multiplex.mx 12 Feb 2008 18:46:16 -0000 1.10
@@ -869,7 +869,7 @@
/* lets copy the head */
if (special <= 1 && retb->htype) {
buntrick = Tsize(retb);
- memcpy(retb->H->heap.base, bh->H->heap.base,
headsize(bh,BATcount(bh)));
+ memcpy(retb->H->heap.base, Hloc(bh, BUNfirst(bh)),
headsize(bh,BATcount(bh)));
retb->H->heap.free = headsize(retb,BATcount(bh));
/* for var sized also copy heap */
if (retb->hvarsized) {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
