Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -400,11 +400,11 @@
 
 (define (common:get-db-tmp-area)
   (if *db-cache-path*
       *db-cache-path*
       (let ((dbpath (create-directory (conc "/tmp/" (current-user-name)
-					    "/megatest_cachedb/"
+					    "/megatest_localdb/"
 					    (common:get-testsuite-name) "/"
 					    (string-translate *toppath* "/" ".")) #t)))
 	(set! *db-cache-path* dbpath)
 	dbpath)))
 
@@ -500,15 +500,17 @@
 			 #t))))
     (debug:print-info 4 *default-log-port* "starting exit process, finalizing databases.")
     (if (and no-hurry (debug:debug-mode 18))
 	(rmt:print-db-stats))
     (let ((th1 (make-thread (lambda () ;; thread for cleaning up, give it five seconds
-			      (let ((run-ids (hash-table-keys *db-local-sync*)))
-				(if (and (not (null? run-ids))
-					 (or (common:legacy-sync-recommended)
-					     (configf:lookup *configdat* "setup" "megatest-db")))
-				    (if no-hurry (db:multi-db-sync run-ids 'new2old))))
+			;; (let ((run-ids (hash-table-keys *db-local-sync*)))
+			;; 	(if (and (not (null? run-ids))
+			;; 		 (or (common:legacy-sync-recommended)
+			;; 		     (configf:lookup *configdat* "setup" "megatest-db")))
+			;; 	    (if no-hurry
+			;; 		(db:multi-db-sync run-ids 'new2old))
+			;; 	    ))
 			      (if *dbstruct-db* (db:close-all *dbstruct-db*))
 			      (if *inmemdb*     (db:close-all *inmemdb*))
 			      (if (and *megatest-db*
 				       (sqlite3:database? *megatest-db*))
 				  (begin

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -110,13 +110,16 @@
 
 ;; (db:with-db dbstruct run-id sqlite3:exec "select blah from blaz;")
 ;; r/w is a flag to indicate if the db is modified by this query #t = yes, #f = no
 ;;
 (define (db:with-db dbstruct run-id r/w proc . params)
-  (let* ((dbdat ;; (if (dbr:dbstruct? dbstruct)
-		    (db:get-db dbstruct run-id))
-;;		    dbstruct)) ;; cheat, allow for passing in a dbdat
+  (let* ((dbdat (if (dbr:dbstruct? dbstruct)
+		    (db:get-db dbstruct run-id)
+		    (begin
+		      (print-call-chain)
+		      (print "db:with-db called with dbdat instead of dbstruct, FIXME!!")
+		      dbstruct))) ;; cheat, allow for passing in a dbdat
 	 (db    (db:dbdat-get-db dbdat))) 
     (handle-exceptions
      exn
      (begin
        (debug:print-error 0 *default-log-port* "sqlite3 issue in db:with-db, dbstruct=" dbstruct ", run-id=" run-id ", proc=" proc ", params=" params " error: " ((condition-property-accessor 'exn 'message) exn))
@@ -251,11 +254,11 @@
     (if tmpdb
 	tmpdb
         ;; (mutex-lock! *rundb-mutex*)
         (let* ((dbpath       (db:dbfile-path)) ;;  0))
                (dbexists     (file-exists? dbpath))
-               (tmpdb        (db:open-megatest-db dbdir: dbpath)) ;; lock-create-open dbpath db:initialize-main-db))
+               (tmpdb        (db:open-megatest-db path: dbpath)) ;; lock-create-open dbpath db:initialize-main-db))
                (mtdb         (db:open-megatest-db))
                (write-access (file-write-access? dbpath)))
           (if (and dbexists (not write-access))
               (set! *db-write-access* #f))
           (dbr:dbstruct-mtdb-set!   dbstruct mtdb)
@@ -287,11 +290,11 @@
 ;; Open the classic megatest.db file (defaults to open in toppath)
 ;;
 ;;   NOTE: returns a dbdat not a dbstruct!
 ;;
 (define (db:open-megatest-db #!key (path #f))
-  (let* ((dbpath       (or path (conc *toppath* "/megatest.db")))
+  (let* ((dbpath       (conc (or path *toppath*) "/megatest.db"))
 	 (dbexists     (file-exists? dbpath))
 	 (db           (db:lock-create-open dbpath
 					    (lambda (db)
 					      (db:initialize-main-db db)
 					      (db:initialize-run-id-db db))))
@@ -778,12 +781,14 @@
 
 ;; Add db direct
 ;;
 (define (db:dispatch-query access-mode rmt-cmd db-cmd . params)
   (if (eq? access-mode 'cached)
-      (apply db:call-with-cached-db db-cmd params)
-      (apply rmt-cmd params)))
+      (print "not doing cached calls right now"))
+;;      (apply db:call-with-cached-db db-cmd params)
+      (apply rmt-cmd params))
+;;)
 
 ;; return the target db handle so it can be used
 ;;
 (define (db:cache-for-read-only source target #!key (use-last-update #f))
   (if (and (hash-table-ref/default *global-db-store* target #f)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -355,11 +355,11 @@
        (if (common:legacy-sync-recommended)
 	   (let loop ()
 	     ;; sync for filesystem local db writes
 	     ;;
              (let ((start-time   (current-seconds)))
-               (if legacy-sync (common:sync-to-megatest.db #f))
+               ;; disabling for now (if legacy-sync (common:sync-to-megatest.db #f))
 	       (if (and debug-mode
 			(> (- start-time last-time) 60))
 		   (begin
 		     (set! last-time start-time)
 		     (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -45,13 +45,13 @@
 # this may save a few milliseconds on launching tests
 # launchwait no
 waivercommentpatt ^WW\d+ [a-z].*
 incomplete-timeout 1
 
-# wait 25 seconds between launching every process
+# wait 3.2 seconds between launching every process
 #
-launch-delay 25
+launch-delay 3.2
 
 # wait for runs to completely complete. yes, anything else is no
 run-wait yes
 
 # If set to "default" the old code is used. Otherwise defaults to 200 or uses