diff -r 31a8f755b7fe -r 211563e4b919 persistentstorage/sql/SRC/Server/SqlSrvStatement.h
--- a/persistentstorage/sql/SRC/Server/SqlSrvStatement.h	Thu Apr 01 00:19:42 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvStatement.h	Wed Apr 14 17:46:32 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"
@@ -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:
 //
@@ -223,10 +224,10 @@
 	TInt ColumnInt(TInt aColIdx) const;
 	TInt64 ColumnInt64(TInt aColIdx) const;
 	TReal ColumnReal(TInt aColIdx) const;
-	TPtrC ColumnText(TInt aColIdx) const;
+	TPtrC ColumnTextL(TInt aColIdx) const;
 	TPtrC8 ColumnBinary(TInt aColIdx) const;
 	
-	HBufC* GetDeclColumnTypesL();
+	const RSqlBufFlat& GetDeclColumnTypesL();
 	
 	HSqlSrvStmtParamBuf* GetParamBufL(TInt aParamIndex, HSqlSrvStmtParamBuf::TDataType aDataType, HSqlSrvStmtParamBuf::TBufType aBufType);
 	void BindParamBufL(TInt aParamIndex);