Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -161,22 +161,19 @@
 ;;    if db not open, open inmem, rundb and sync then return inmem
 ;;    inuse gets set automatically for rundb's
 ;;
 ;; (define db:get-db db:get-subdb)
 
-;; (define (db:get-db subdb #;dbstruct run-id) ;; RENAME TO db:get-dbh
-;;   ;; (let* ((subdb (dbfile:get-subdb dbstruct run-id)))
-;;     (if (stack? (dbr:subdb-dbstack subdb))
-;; 	(if (stack-empty? (dbr:subdb-dbstack subdb))
-;; 	    (let* ((dbname (db:run-id->dbname run-id))
-;; 		   (newdb  (db:open-megatest-db path: (db:dbfile-path)
-;; 						name: dbname)))
-;; 	      ;; NOTE: pushing on the stack only happens AFTER the handle has been used
-;; 	      ;; (stack-push! (dbr:dbstruct-dbstack dbstruct) newdb)
-;; 	      newdb)
-;;           (stack-pop! (dbr:subdb-dbstack subdb)))
-;; 	(db:open-db subdb run-id))) ;; )
+(define (db:get-db dbstruct run-id) 
+   (let* ((subdb (dbfile:get-subdb dbstruct run-id))
+        (dbdat (dbfile:get-dbdat dbstruct run-id)))
+        (if (dbr:dbdat? dbdat)
+          dbdat
+          (dbfile:open-db *dbstruct-dbs* #f db:initialize-main-db)
+        )
+   )
+)
 
 (define-inline (db:generic-error-printout exn . message)
   (print-call-chain (current-error-port))
   (apply debug:print-error 0 *default-log-port* message)
   (debug:print-error 0 *default-log-port* "   params: " params

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -518,11 +518,11 @@
 (define (tasks:find-task-queue-records dbstruct target run-name test-patt state-patt action-patt)
   ;; (handle-exceptions
   ;;  exn
   ;;  '()
   ;;  (sqlite3:first-row
-  (let ((db (db:delay-if-busy (db:get-db dbstruct)))
+  (let ((db (db:delay-if-busy (db:get-db dbstruct #f)))
 	(res '()))
     (sqlite3:for-each-row 
      (lambda (a . b)
        (set! res (cons (cons a b) res)))
      db "SELECT id,action,owner,state,target,name,testpatt,keylock,params FROM tasks_queue 

Index: tests/simplerun/thebeginning.scm
==================================================================
--- tests/simplerun/thebeginning.scm
+++ tests/simplerun/thebeginning.scm
@@ -52,5 +52,8 @@
 ;; *************** db.scm tests ****************
 
 
 (define thisdbdat (db:open-db dbstruct #f))
 (test #f #t (dbr:dbdat? thisdbdat))
+
+(test #f #t (dbr:subdb? (db:get-db dbstruct #f)))
+(test #f #t (dbr:subdb? (db:get-db dbstruct 1)))