diff -r 3eacc0623088 -r 55f2396f6d25 persistentstorage/sql/SRC/Client/SqlStmtSession.h
--- a/persistentstorage/sql/SRC/Client/SqlStmtSession.h	Fri Apr 16 16:49:27 2010 +0300
+++ b/persistentstorage/sql/SRC/Client/SqlStmtSession.h	Mon May 03 14:09:14 2010 +0300
@@ -9,6 +9,7 @@
 // Nokia Corporation - initial contribution.
 //
 // Contributors:
+// NTT DOCOMO, INC - Fix for Bug 1915 "SQL server panics when using long column type strings"
 //
 // Description:
 //
@@ -97,8 +98,8 @@
 	inline MStreamBuf* ColumnSourceL(TInt aColumnIndex);
 	inline MStreamBuf* ParamSinkL(TSqlSrvFunction aFunction, TInt aParamIndex);
 
-	HBufC* GetDeclColumnTypesL(TInt aColumnCount);
-		
+	TInt GetDeclColumnTypes(RSqlBufFlat& aDeclColumnTypeBuf);	
+	
 private:
 	TInt DoBindNext(TSqlSrvFunction aFunction, TIpcArgs& aIpcArgs, RSqlBufFlat& aColumnBuf);
 	TInt Retry(RSqlBufFlat& aBufFlat, TInt aSize, TSqlBufFlatType aWhat);