[Firebird-checkins] CVS: firebird2/src/dsql gen.cpp, 1.135, 1.135.2.1

[Adriano d. S. F. <asf...@us...>]

Build Version :  T2.5.0.18438 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18598 2008/02/20 15:28:40 asfernandes )

Update of /cvsroot/firebird/firebird2/src/dsql
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14656/src/dsql

Modified Files:
      Tag: B2_5_ExtEngines
	gen.cpp 
Log Message:
Work in progress

Index: gen.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dsql/gen.cpp,v
retrieving revision 1.135
retrieving revision 1.135.2.1
diff -b -U3 -r1.135 -r1.135.2.1
--- gen.cpp	23 Jan 2008 15:51:47 -0000	1.135
+++ gen.cpp	20 Feb 2008 15:28:37 -0000	1.135.2.1
@@ -628,11 +628,11 @@
 
 		const USHORT fromCharSet = parameter->par_desc.getCharSet();
 		const USHORT toCharSet = (fromCharSet == CS_NONE || fromCharSet == CS_BINARY) ?
-			fromCharSet : request->req_dbb->dbb_att_charset;
+			fromCharSet : request->req_charset;
 
 		if (parameter->par_desc.dsc_dtype <= dtype_any_text &&
-			request->req_dbb->dbb_att_charset != CS_NONE &&
-			request->req_dbb->dbb_att_charset != CS_BINARY)
+			request->req_charset != CS_NONE &&
+			request->req_charset != CS_BINARY)
 		{
 			USHORT adjust = 0;
 			if (parameter->par_desc.dsc_dtype == dtype_varying)
@@ -657,8 +657,8 @@
 					request->req_dbb->dbb_minor_version) >= ODS_11_1 &&
 			parameter->par_desc.dsc_dtype == dtype_blob &&
 			parameter->par_desc.dsc_sub_type == isc_blob_text &&
-			request->req_dbb->dbb_att_charset != CS_NONE &&
-			request->req_dbb->dbb_att_charset != CS_BINARY)
+			request->req_charset != CS_NONE &&
+			request->req_charset != CS_BINARY)
 		{
 			if (fromCharSet != toCharSet)
 				parameter->par_desc.setTextType(toCharSet);