--- a/persistentstorage/sql/SRC/Server/SqlSrvFileData.cpp	Thu Apr 01 00:19:42 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvFileData.cpp	Wed Apr 14 17:46:32 2010 +0300
@@ -192,7 +192,11 @@
 @panic SqlDb 4 In _DEBUG mode. Invalid aFileNameArgNum value.
 @panic SqlDb 7 In _DEBUG mode. Invalid TSqlSrvFileData object. Not initialized system drive and path.
 */
-void TSqlSrvFileData::SetL(const RMessage2& aMessage, TInt aFileNameLen, TInt aFileNameArgNum, const TDesC8* aConfigStr)
+void TSqlSrvFileData::SetL(const RMessage2& aMessage, TInt aFileNameLen, TInt aFileNameArgNum, 
+#ifdef SQLSRV_STARTUP_TEST
+                           const TDesC& aDbFileName,
+#endif          
+                           const TDesC8* aConfigStr)
 	{
 	__SQLASSERT((TUint)aFileNameArgNum < KMaxMessageArguments, ESqlPanicBadArgument);
 	__SQLASSERT(iSysDrivePrivatePath.DriveAndPath().Length() > 0, ESqlPanicInternalError);
@@ -202,9 +206,11 @@
 		__SQLLEAVE(KErrBadName);
 		}
 #ifdef SQLSRV_STARTUP_TEST
-	aMessage.Int0();//prevents compiler warning
-	aFileNameArgNum = aFileNameArgNum;//prevents compiler warning
-	iFileName.Copy(*(const TDesC*)aConfigStr);
+	//To prevent compiler warning
+	aMessage.Int0();
+	aFileNameArgNum = aFileNameArgNum;
+	//
+	iFileName.Copy(aDbFileName);
 #else
 	aMessage.ReadL(aFileNameArgNum, iFileName);
 #endif	
@@ -223,9 +229,7 @@
 		::CreatePrivateDataPathL(iFs, iDrive);
 		}
 	iReadOnly = ::IsReadOnlyFileL(iFs, FileName());
-#ifndef SQLSRV_STARTUP_TEST
 	::ExtractConfigParamsL(aConfigStr, iConfigParams, iConfig);
-#endif	
 	}
 
 /**