Index: xrpc_server.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_server.mx,v
retrieving revision 1.78
diff -u -r1.78 xrpc_server.mx
--- xrpc_server.mx	17 Jul 2008 10:51:33 -0000	1.78
+++ xrpc_server.mx	17 Jul 2008 11:05:53 -0000
@@ -194,11 +194,7 @@
 static MT_Sema xrpc_commit_sema;
 static xrpc_commit_t *xrpc_commit_active = NULL;
 
-/* shared BATs */
-BAT *xrpc_qids = NULL, *xrpc_statuses = NULL, *xrpc_timeouts = NULL;
-BAT *xrpc_locks = NULL, *xrpc_wsbats = NULL;
-/* only used by xrpc_server */
-BAT *xrpc_trusted = NULL, *xrpc_admin = NULL, *xrpc_user = NULL;
+BAT *xrpc_trusted = NULL, *xrpc_admin = NULL;
 
 int CMDmy_hostname(char **res)
 {
@@ -872,13 +868,14 @@
 
 
 @= xrpc_bat
-    xrpc_@1 = BATnew(TYPE_void,ATOMindex("@2"),1024);
-    assert(xrpc_@1);
-    BATseqbase(xrpc_@1, 1);
-    BBPrename(xrpc_@1->batCacheid, "xrpc_@1");
+    xrpc_bat = BATnew(TYPE_void,ATOMindex("@2"),1024);
+    assert(xrpc_bat);
+    BATseqbase(xrpc_bat, 1);
+    BBPrename(xrpc_bat->batCacheid, "xrpc_@1");
 @c
 
 bat* xrpc_prelude(void) {
+    BAT *xrpc_bat = NULL; 
     @:xrpc_bat(qids,str)@
     @:xrpc_bat(statuses,str)@
     @:xrpc_bat(timeouts,lng)@
@@ -886,7 +883,9 @@
     @:xrpc_bat(wsbats,bat)@
 
     @:xrpc_bat(trusted,str)@
+    xrpc_trusted = xrpc_bat;
     @:xrpc_bat(admin,str)@
+    xrpc_admin = xrpc_bat;
     @:xrpc_bat(user,str)@
     CMDmy_hostname(&xrpc_hostname);
     MT_init_sema(xrpc_commit_sema,0, "XRPC_COMMIT_SEMA");