Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32117/runtime
Modified Files:
Tag: M5XQ
pathfinder.mx
Log Message:
propagated changes of Wednesday Oct 07 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/07 - stmane: runtime/pathfinder.mx,1.465
propagated changes of Wednesday Oct 07 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/07 - stmane: runtime/pathfinder.mx,1.462.4.2
propagated changes of Wednesday Oct 07 2009
from the Aug2009_NFI branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/07 - boncz: runtime/pathfinder.mx,1.462.6.3
not really a noticable fix under normal XQuery use:
- make sure ws_create(0) works when typed in standalone at the MIL prompt
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/07 - stmane: runtime/pathfinder.mx,1.462.6.4
removed debug print that apparently sneaked in with
"
2009/10/07 - boncz: pathfinder/runtime/pathfinder.mx,1.462.6.3
not really a noticable fix under normal XQuery use:
- make sure ws_create(0) works when typed in standalone at the MIL prompt
"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U pathfinder.mx
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.458.2.6
retrieving revision 1.458.2.7
diff -u -d -r1.458.2.6 -r1.458.2.7
--- pathfinder.mx 7 Oct 2009 14:23:56 -0000 1.458.2.6
+++ pathfinder.mx 7 Oct 2009 17:08:27 -0000 1.458.2.7
@@ -532,10 +532,7 @@
# dummy variables to make MIL test scripts work
# (otherwise always overridden by a declaration in the pf-generated MIL plan)
-var xrpc_mode := "";
-var xrpc_qid := "";
-var xrpc_method := "";
-var xrpc_timeout := 30000LL;
+var xrpc_seqnr, xrpc_coord, xrpc_mode := "", xrpc_qid := "", xrpc_method :=
"", xrpc_timeout := 30000LL;
# abort a 2PC transaction, keeping the record (note ws should have been
destroyed already)
PROC _ws_xrpc_abort(oid idx, str status) : void
@@ -1581,7 +1578,7 @@
# NOTE: use pre-query MIL variables xrpc_qid/xrpc_timeout to possibly
re-use an existing ws
lock_set(xrpc_lock);
- var wslock := lock_nil, ws, xrpc, idx, err := CATCH(ws := _ws_new(xrpc :=
_ws_xrpcget(), idx := oid(abs(xrpc)), update));
+ var wslock := lock_nil, ws, xrpc := 0, idx, err := CATCH(ws :=
_ws_new(xrpc := _ws_xrpcget(), idx := oid(abs(xrpc)), update));
if (xrpc != 0) wslock := xrpc_locks.find(idx);
lock_unset(xrpc_lock);
if (not(isnil(err))) ERROR(err);
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
