Update of /cvsroot/monetdb/MonetDB4/src/monet
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17183
Modified Files:
Tag: MonetDB_4-22
monet_multiplex.mx
Log Message:
When copying the heap, take any free space at the start of the heap
into account (i.e. use BUNfirst()).
This fixes the reopened immuned for updates bug.
Index: monet_multiplex.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/monet/monet_multiplex.mx,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- monet_multiplex.mx 5 Feb 2008 22:33:33 -0000 1.8.2.1
+++ monet_multiplex.mx 11 Feb 2008 14:34:00 -0000 1.8.2.2
@@ -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
