--- a/persistentstorage/sql/SRC/Server/SqlSrvMain.cpp	Fri Apr 16 16:49:27 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvMain.cpp	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"
@@ -30,7 +30,10 @@
 #include <stdio.h>
 #endif
 
-static CSqlServer* TheServer = NULL;//The single CSqlServer instance
+#ifndef SQLSRV_STARTUP_TEST
+static  
+#endif
+CSqlServer* TheServer = NULL;//The single CSqlServer instance
 
 _LIT(KMatchAllDbFiles, "*");
 _LIT(KDefaultICollationDllName, "");
@@ -296,10 +299,7 @@
 	//the SQL server startup code.
 	StartL(KSqlSrvName);
 #endif	
-#ifdef _SQLPROFILER 
-    TheSqlSrvStartTime.UniversalTime();
     SQLPROFILER_SERVER_START();
-#endif  
 	//Configure the SQLite library
 	__SQLLEAVE_IF_ERROR(sqlite3_config(SQLITE_CONFIG_LOOKASIDE, KSqliteLookAsideCellSize, KSqliteLookAsideCellCount));
 	//Open SQLITE library - this must be the first call after StartL() (os_symbian.cpp, "TheAllocator" initialization rellated).
@@ -420,7 +420,12 @@
 */
 TBool CSqlServer::Check(const TSecurityPolicy& aPolicy) const
 	{
+#ifdef SQLSRV_STARTUP_TEST
+	aPolicy.Package();//to prevent compiler warning
+	return ETrue;
+#else	
 	return aPolicy.CheckPolicy(CServer2::Message());
+#endif
 	}
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////