diff -r 28839de615b4 -r 26645d81f48d persistentstorage/sql/SRC/Client/SqlStatementImpl.inl
--- a/persistentstorage/sql/SRC/Client/SqlStatementImpl.inl	Thu Aug 19 11:36:21 2010 +0300
+++ b/persistentstorage/sql/SRC/Client/SqlStatementImpl.inl	Tue Aug 31 16:57:14 2010 +0300
@@ -53,10 +53,10 @@
 */
 inline TPtrC RSqlLongColumnColl::Text(TInt aColumnIndex) const
 	{
-	__SQLASSERT(aColumnIndex >= 0, ESqlPanicBadArgument);
+	__ASSERT_DEBUG(aColumnIndex >= 0, __SQLPANIC(ESqlPanicBadArgument));
 	LONGCOL_INVARIANT();
 	TInt rc = FindValue(aColumnIndex);
-	__SQLASSERT_ALWAYS(rc >= 0, ESqlPanicInternalError);
+	__ASSERT_ALWAYS(rc >= 0, __SQLPANIC(ESqlPanicInternalError));
 	TPtrC8 ptr(iValues[rc].iData->Des());
 	return TPtrC(reinterpret_cast <const TUint16*> (ptr.Ptr()), ptr.Length() / sizeof(TUint16));
 	}
@@ -70,10 +70,10 @@
 */
 inline TPtrC8 RSqlLongColumnColl::Binary(TInt aColumnIndex) const
 	{
-	__SQLASSERT(aColumnIndex >= 0, ESqlPanicBadArgument);
+	__ASSERT_DEBUG(aColumnIndex >= 0, __SQLPANIC(ESqlPanicBadArgument));
 	LONGCOL_INVARIANT();
 	TInt rc = FindValue(aColumnIndex);
-	__SQLASSERT_ALWAYS(rc >= 0, ESqlPanicInternalError);
+	__ASSERT_ALWAYS(rc >= 0, __SQLPANIC(ESqlPanicInternalError));
 	return iValues[rc].iData->Des();
 	}
 
@@ -85,7 +85,7 @@
 */
 inline TBool RSqlLongColumnColl::IsPresent(TInt aColumnIndex) const
 	{
-	__SQLASSERT(aColumnIndex >= 0, ESqlPanicBadArgument);
+	__ASSERT_DEBUG(aColumnIndex >= 0, __SQLPANIC(ESqlPanicBadArgument));
 	LONGCOL_INVARIANT();
 	return FindValue(aColumnIndex) >= 0;
 	}
@@ -99,7 +99,7 @@
 */
 inline TInt RSqlLongColumnColl::FindValue(TInt aColumnIndex) const
 	{
-	__SQLASSERT(aColumnIndex >= 0, ESqlPanicBadArgument);
+	__ASSERT_DEBUG(aColumnIndex >= 0, __SQLPANIC(ESqlPanicBadArgument));
 	return iValues.Find(aColumnIndex, &RSqlLongColumnColl::TData::Compare);
 	}
 
@@ -113,8 +113,8 @@
 	iIndex(aIndex),
 	iData(aData)
 	{
-	__SQLASSERT(aIndex >= 0, ESqlPanicBadArgument);
-	__SQLASSERT(aData != NULL, ESqlPanicBadArgument);
+	__ASSERT_DEBUG(aIndex >= 0, __SQLPANIC(ESqlPanicBadArgument));
+	__ASSERT_DEBUG(aData != NULL, __SQLPANIC(ESqlPanicBadArgument));
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -145,7 +145,7 @@
 		{
 		return err;	
 		}
-    __SQLASSERT(iColumnCnt >= 0, ESqlPanicInternalError);
+	__ASSERT_DEBUG(iColumnCnt >= 0, __SQLPANIC(ESqlPanicInternalError));
     err = iColumnValueBuf.SetCount(iColumnCnt);
     if(err != KErrNone)
         {
@@ -342,8 +342,8 @@
 */
 inline MStreamBuf* CSqlStatementImpl::ColumnSourceL(TInt aColumnIndex)
 	{
-	__SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
-	__SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+	__ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+	__ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
 	iColumnValBufIt.MoveTo(aColumnIndex);		
 	return iColumnValBufIt.IsPresent() ? iColumnValBufIt.StreamL() : iSqlStmtSession.ColumnSourceL(aColumnIndex);
 	}
@@ -369,7 +369,7 @@
 */
 inline MStreamBuf* CSqlStatementImpl::ParamSinkL(TSqlSrvFunction aFunction, TInt aParamIndex)
 	{
-	__SQLASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, ESqlPanicBadColumnIndex);
+	__ASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
 	return iSqlStmtSession.ParamSinkL(aFunction, aParamIndex);
 	}