--- a/persistentstorage/sql/SRC/Server/SqlSrvFileData.h	Fri Apr 16 16:49:27 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvFileData.h	Mon May 03 14:09:14 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -72,7 +72,11 @@
 public:
 	inline void InitL(RFs& aFs, const TDriveName& aSysDriveName, const TDesC& aServerPrivatePath, 
 					  const TDesC& aConfigFileName, const CDbConfigFiles* aDbConfigFiles);
-	void SetL(const RMessage2& aMessage, TInt aFileNameLen, TInt aFileNameArgNum, const TDesC8* aConfigStr = NULL);
+	void SetL(const RMessage2& aMessage, TInt aFileNameLen, TInt aFileNameArgNum,
+#ifdef SQLSRV_STARTUP_TEST
+	          const TDesC& aDbFileName,
+#endif	        
+	          const TDesC8* aConfigStr = NULL);
   	void SetFromHandleL(const RMessage2& aMessage, const TDesC& aDbFileName, TBool aCreated, TBool aReadOnly, const TDesC8* aConfigStr = NULL);
 
 	inline RFs& Fs() const;
@@ -129,7 +133,7 @@
 								   const TDesC& aConfigFileName, const CDbConfigFiles* aDbConfigFiles)
 	{
 	iFs = aFs;
-	iSysDrivePrivatePath.Set(aSysDriveName, &aServerPrivatePath, 0);
+	__SQLLEAVE_IF_ERROR(iSysDrivePrivatePath.Set(aSysDriveName, &aServerPrivatePath, 0));
 	iConfig.InitL(aFs, aConfigFileName);
 	iConfig.GetConfigParamsL(KNullDesC8, iConfigParams);//iConfigParams initialized with the config file params 
 														//(because an empty configuration string is passed as an argument)