Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v
diff -u -r1.88.2.4 -r1.88.2.5
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	20 Oct 2015 08:01:04 -0000	1.88.2.4
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	30 Nov 2015 12:57:42 -0000	1.88.2.5
@@ -113,11 +113,13 @@
 # We now use the following global variables:
 #
 # Server-Wide NSV arrays, keys:
-#     db_default_database  .
 #     db_available_pools   $dbn
 #     db_driverkey         $dbn
 #     db_pool_to_dbn       $pool
 #
+# Global Variables
+#    ::acs::default_database
+#
 # Per-thread Tcl global variables:
 #   One Tcl Array per Database Name:
 #     db_state_${dbn}
@@ -156,7 +158,7 @@
     @creation-date 2003/03/16
 } {
     if { $dbn eq "" } {
-        set dbn [nsv_get {db_default_database} .]
+        set dbn $::acs::default_database
     }
     return "db_state_${dbn}"
 }
@@ -195,6 +197,11 @@
         }
     }
 
+    set key ::acs::db_driverkey($dbn)
+    if {[info exists $key]} {
+        return [set $key]
+    }
+
     if { ![nsv_exists db_driverkey $dbn] } {
         # This ASSUMES that any overriding of this default value via
         # "ns_param driverkey_dbn" has already been done:
@@ -224,7 +231,7 @@
         nsv_set db_driverkey $dbn $driverkey
     }
 
-    return [nsv_get db_driverkey $dbn]
+    return [set $key [nsv_get db_driverkey $dbn]]
 }
 
 
@@ -293,7 +300,7 @@
     The nsv containing the list is initialized by the bootstrap script and should
     never be referenced directly by user code.
 } {
-    return [nsv_get ad_known_database_types .]
+    return $::acs::known_database_types
 }