Changeset: 204f53bed9de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=204f53bed9de
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (43 lines):
diff -r 98b535c0e727 -r 204f53bed9de MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mx Wed Oct 13 18:00:34 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mx Thu Oct 14 09:27:50 2010 +0200
@@ -2106,13 +2106,13 @@
if (!bs->P.lview) {
b = getBBPdescriptor(hp, lock);
bs->B.H->heap.base = b->H->heap.base + (size_t)
bs->B.H->heap.base;
+ /* if we shared the hash before, share
+ it again note that if the parent's
+ hash is destroyed, we also don't
+ have a hash anymore */
+ if (bs->B.H->hash == (Hash *) -1)
+ bs->B.H->hash = b->H->hash;
}
- /* if we shared the hash before, share it again
- note that if the parent's hash is
- destroyed, we also don't have a hash
- anymore */
- if (bs->B.H->hash == (Hash *) -1)
- bs->B.H->hash = b->H->hash;
}
if (tp) {
incref(tp, 0, lock);
@@ -2120,13 +2120,13 @@
bs->B.H != bs->B.T) { /* mirror? */
b = getBBPdescriptor(tp, lock);
bs->B.T->heap.base = b->H->heap.base + (size_t)
bs->B.T->heap.base;
+ /* if we shared the hash before, share
+ it again note that if the parent's
+ hash is destroyed, we also don't
+ have a hash anymore */
+ if (bs->B.T->hash == (Hash *) -1)
+ bs->B.T->hash = b->H->hash;
}
- /* if we shared the hash before, share it again
- note that if the parent's hash is
- destroyed, we also don't have a hash
- anymore */
- if (bs->B.T->hash == (Hash *) -1)
- bs->B.T->hash = b->H->hash;
}
if (hvp)
incref(hvp, 0, lock);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
