Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1226,11 +1226,11 @@
                                     END WHERE id=?;")
 	'(test-set-log            "UPDATE tests SET final_logf=? WHERE id=?;")
 	'(test-set-rundir-by-test-id "UPDATE tests SET rundir=? WHERE id=?")
 	'(test-set-rundir         "UPDATE tests SET rundir=? WHERE run_id=? AND testname=? AND item_path=?;")
 	'(delete-tests-in-state   "DELETE FROM tests WHERE state=? AND run_id=?;")
-	'(tests:test-set-toplog    "UPDATE tests SET final_logf=? WHERE run_id=? AND testname=? AND item_path='';")
+	'(tests:test-set-toplog   "UPDATE tests SET final_logf=? WHERE run_id=? AND testname=? AND item_path='';")
     ))
 
 ;; do not run these as part of the transaction
 (define db:special-queries   '(rollup-tests-pass-fail
 			       db:roll-up-pass-fail-counts
@@ -1254,13 +1254,14 @@
 	   (debug:print-info 4 "Writing cached data " data))
 
        ;; prepare the needed statements, do each only once
        (for-each (lambda (request-item)
 		   (let ((stmt-key (cdb:packet-get-qtype request-item)))
-		     (if (and (not (hash-table-ref/default queries stmt-key #f))
-			      (not (member stmt-key db:special-queries)))
+		     (debug:print-info 11 "stmt-key=" stmt-key ", request-item=" request-item)
+		     (if (not (hash-table-ref/default queries stmt-key #f))
 			 (let ((stmt (alist-ref stmt-key db:queries)))
+			   (debug:print-info 11 "stmt-key=" stmt-key ", stmt=" stmt)
 			   (if stmt
 			       (hash-table-set! queries stmt-key (sqlite3:prepare db (car stmt)))
 			       (if (procedure? stmt-key)
 				   (hash-table-set! queries stmt-key #f)
 				   (debug:print 0 "ERROR: Missing query spec for " stmt-key "!")))))))
@@ -1268,10 +1269,11 @@
        
        ;; outer loop to handle special queries that cannot be handled in the
        ;; transaction.
        (let outerloop ((special-qry #f)
 		       (stmts       data))
+	 (debug:print-info 11 "special-qry=" special-qry ", stmts=" stmts)
 	 (if special-qry
 
 	     ;; handle a query that cannot be part of the grouped queries
 	     (let* ((stmt-key       (cdb:packet-get-qtype special-qry))
 		    (return-address (cdb:packet-get-client-sig special-qry))
@@ -1326,11 +1328,12 @@
 			       (let innerloop ((hed (car stmts))
 					       (tal (cdr stmts)))
 				 (let ((params         (cdb:packet-get-params hed))
 				       (return-address (cdb:packet-get-client-sig hed))
 				       (stmt-key       (cdb:packet-get-qtype hed)))
-				   (if (member stmt-key db:special-queries)
+				   (if (or (not (hash-table-ref/default queries stmt-key #f))
+					   (member stmt-key db:special-queries))
 				       (begin
 					 (debug:print-info 11 "Handling special statement " stmt-key)
 					 (cons hed tal))
 				       (begin
 					 (debug:print-info 11 "Executing " stmt-key " for " params)

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -136,11 +136,10 @@
     ;; The heavy lifting
     ;;
     ;; make-vector-record cdb packet client-sig qtype immediate query-sig params qtime
     ;;
     (let loop ((queue-lst '()))
-      (print "GOT HERE EH?")
       (let* ((rawmsg (receive-message* pull-socket))
 	     (packet (db:string->obj rawmsg)))
 	(debug:print-info 12 "server=> received packet=" packet)
 	(if #t ;; (cdb:packet-get-immediate packet) ;; process immediately or put in queue
 	    (begin

Index: testzmq/mockupserver.scm
==================================================================
--- testzmq/mockupserver.scm
+++ testzmq/mockupserver.scm
@@ -54,13 +54,17 @@
     ))
 
 (define db (open-db))
 ;; (define queuelst '())
 ;; (define mx1 (make-mutex))
+
+(define max-queue-len 0)
 
 (define (process-queue queuelst)
   (let ((queuelen (length queuelst)))
+    (if (> queuelen max-queue-len)
+	(set! max-queue-len queuelen))
     (for-each
      (lambda (item)
        (let ((cname (vector-ref item 1))
 	     (clcmd (vector-ref item 2))
 	     (cdata (vector-ref item 3)))
@@ -129,6 +133,6 @@
 (thread-start! th2)
 (thread-join! th2)
 
 (let* ((run-time       (- (current-seconds) start-time))
        (queries/second (/  total-db-accesses run-time)))
-  (print "Server exited! Total db accesses=" total-db-accesses " in " run-time " seconds for " queries/second " queries/second"))
+  (print "Server exited! Total db accesses=" total-db-accesses " in " run-time " seconds for " queries/second " queries/second with max queue length of: " max-queue-len))