diff -r 28839de615b4 -r 26645d81f48d persistentstorage/sql/SRC/Server/SqlSrvFileData.cpp
--- a/persistentstorage/sql/SRC/Server/SqlSrvFileData.cpp	Thu Aug 19 11:36:21 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvFileData.cpp	Tue Aug 31 16:57:14 2010 +0300
@@ -15,7 +15,7 @@
 
 #include "SqlSrvFileData.h"
 #include "SqlSrvUtil.h"
-#include "SqlPanic.h"
+#include "SqlAssert.h"
 #include "SqlSrvStrings.h"
 #include "SqlSrvResourceProfiler.h"
 
@@ -35,13 +35,13 @@
 static void CreatePrivateDataPathL(RFs& aFs, TDriveNumber aDriveNumber)
 	{
 	TDriveInfo driveInfo;
-	__SQLLEAVE_IF_ERROR(aFs.Drive(driveInfo, aDriveNumber));
+	__SQLLEAVE_IF_ERROR2(aFs.Drive(driveInfo, aDriveNumber));
 	if(!(driveInfo.iDriveAtt & KDriveAttRom))
 		{
 		TInt err = aFs.CreatePrivatePath(aDriveNumber);
 		if(err != KErrNone && err != KErrAlreadyExists)
 			{
-			__SQLLEAVE(err);
+			__SQLLEAVE2(err);
 			}
 		}
 	}
@@ -114,16 +114,16 @@
 static void DoFullFileNameL(TDes& aDbFileName, const TDesC& aSysDrivePrivatePath, TDriveNumber& aDrive)
 	{
 	TParse parse;
-	__SQLLEAVE_IF_ERROR(parse.Set(aDbFileName, &aSysDrivePrivatePath, NULL));
+	__SQLLEAVE_IF_ERROR2(parse.Set(aDbFileName, &aSysDrivePrivatePath, NULL));
 	if(!parse.NamePresent())
 		{
-		__SQLLEAVE(KErrBadName);	
+		__SQLLEAVE2(KErrBadName);	
 		}
 	aDbFileName.Copy(parse.FullName());
 	TPtrC driveName = parse.Drive();
-	__SQLASSERT(driveName.Length() > 0, ESqlPanicInternalError);
+	__ASSERT_DEBUG(driveName.Length() > 0, __SQLPANIC2(ESqlPanicInternalError));
 	TInt driveNumber = -1;
-	__SQLLEAVE_IF_ERROR(RFs::CharToDrive(driveName[0], driveNumber));
+	__SQLLEAVE_IF_ERROR2(RFs::CharToDrive(driveName[0], driveNumber));
 	aDrive = static_cast <TDriveNumber> (driveNumber);
 	}
 
@@ -143,7 +143,7 @@
 	//If SQL server private path is in the file name - leave
 	if(::IsPrivatePathInFileName(aDbFileName, aServerPrivatePath))
 		{
-		__SQLLEAVE(KErrArgument);
+		__SQLLEAVE2(KErrArgument);
 		}
 	//Extract database SID from the name
 	aIsSecureFileNameFmt = ::IsSecureFileNameFmt(aDbFileName);
@@ -198,8 +198,8 @@
 #endif          
                            const TDesC8* aConfigStr)
 	{
-	__SQLASSERT((TUint)aFileNameArgNum < KMaxMessageArguments, ESqlPanicBadArgument);
-	__SQLASSERT(iSysDrivePrivatePath.DriveAndPath().Length() > 0, ESqlPanicInternalError);
+	__ASSERT_DEBUG((TUint)aFileNameArgNum < KMaxMessageArguments, __SQLPANIC(ESqlPanicBadArgument));
+	__ASSERT_DEBUG(iSysDrivePrivatePath.DriveAndPath().Length() > 0, __SQLPANIC(ESqlPanicInternalError));
 		
 	if(aFileNameLen < 1 || aFileNameLen > KMaxFileName)
 		{