1.1 --- a/core/Database.cpp	Fri Jun 01 02:30:29 2007 +0000
     1.2 +++ b/core/Database.cpp	Fri Jun 01 04:22:53 2007 +0000
     1.3 @@ -123,7 +123,7 @@
     1.4  		}
     1.5  	} else if (m_ParseState == DBPARSE_LEVEL_MAIN) {
     1.6  		s_CurInfo = ConfDbInfo();
     1.7 -		s_CurInfo.database = m_StrTab.AddString(name);
     1.8 +		s_CurInfo.name = m_StrTab.AddString(name);
     1.9  		m_ParseState = DBPARSE_LEVEL_DATABASE;
    1.10  	} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
    1.11  		m_ParseLevel++;
    1.12 @@ -229,6 +229,7 @@
    1.13  		return false;
    1.14  	}
    1.15  
    1.16 +	const char *dname = pInfo->info.driver;
    1.17  	if (!pInfo->realDriver)
    1.18  	{
    1.19  		/* Try to assign a real driver pointer */
    1.20 @@ -238,6 +239,7 @@
    1.21  			{
    1.22  				m_pDefault = FindOrLoadDriver(m_DefDriver.c_str());
    1.23  			}
    1.24 +			dname = m_DefDriver.size() ? m_DefDriver.c_str() : "default";
    1.25  			pInfo->realDriver = m_pDefault;
    1.26  		} else {
    1.27  			pInfo->realDriver = FindOrLoadDriver(pInfo->info.driver);
    1.28 @@ -260,7 +262,7 @@
    1.29  	}
    1.30  	*pdb = NULL;
    1.31  
    1.32 -	UTIL_Format(error, maxlength, "Driver \"%s\" not found", pInfo->driver);
    1.33 +	UTIL_Format(error, maxlength, "Driver \"%s\" not found", dname);
    1.34  
    1.35  	return false;
    1.36  }
    1.37 @@ -334,7 +336,7 @@
    1.38  
    1.39  	HandleSecurity sec(NULL, g_pCoreIdent);
    1.40  
    1.41 -	return g_HandleSys.ReadHandle(hndl, dtype, &sec, ptr);
    1.42 +	return g_HandleSys.ReadHandle(hndl, type, &sec, ptr);
    1.43  }
    1.44  
    1.45  HandleError DBManager::ReleaseHandle(Handle_t hndl, DBHandleType type, IdentityToken_t *token)
    1.46 @@ -397,7 +399,7 @@
    1.47  	}
    1.48  
    1.49  	char filename[PLATFORM_MAX_PATH];
    1.50 -	UTIL_Format(filename, sizeof(filename), "dbi.%s", name);
    1.51 +	UTIL_Format(filename, sizeof(filename), "dbi.%s.ext", name);
    1.52  
    1.53  	IExtension *pExt = g_Extensions.LoadAutoExtension(filename);
    1.54  	if (!pExt || !pExt->IsLoaded() || m_drivers.size() <= last_size)