Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1193
Modified Files:
Tag: GDK-2
pf_support.mx
Log Message:
Don't attempt to cast a pointer to a BUN.
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.265.2.2
retrieving revision 1.265.2.3
diff -u -d -r1.265.2.2 -r1.265.2.3
--- pf_support.mx 15 Aug 2007 11:45:49 -0000 1.265.2.2
+++ pf_support.mx 15 Aug 2007 13:09:08 -0000 1.265.2.3
@@ -7216,13 +7216,10 @@
{
int mode = ((*wsid) & (3LL << 30)) >> 30;
lng nil = lng_nil;
- BUN self_passed; /* this query uses meta-information functions? */
BUN others_passed; /* there are multiple such queries active? */
MT_set_lock(PF_SHORT_LOCK, "pflock_meta: shortLock precheck");
- self_passed = BUNlocate(ws_overlaps_ws, wsid, &nil);
- if (*wsid == pf_special) self_passed = (BUN) wsid;
- if (self_passed != BUN_NONE) {
+ if (*wsid == pf_special || BUNlocate(ws_overlaps_ws, wsid, &nil) !=
BUN_NONE) {
MT_unset_lock(PF_SHORT_LOCK, "pflock_meta: shortLock precheck");
return GDK_SUCCEED; /* already got permission to proceed */
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
