firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Misc.

Browse Source
This commit is contained in:
robocop 2007-07-08 08:43:30 +00:00
parent 8ae458178e
commit 5c152e5cfe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dsql/gen.cpp
View File

@ -611,8 +611,8 @@ void GEN_port( dsql_req* request, dsql_msg* message)
{
parameter->par_parameter = number++;
USHORT fromCharSet = parameter->par_desc.getCharSet();
USHORT toCharSet = (fromCharSet == CS_NONE || fromCharSet == CS_BINARY) ?
const USHORT fromCharSet = parameter->par_desc.getCharSet();
const USHORT toCharSet = (fromCharSet == CS_NONE || fromCharSet == CS_BINARY) ?
fromCharSet : request->req_dbb->dbb_att_charset;
if (parameter->par_desc.dsc_dtype <= dtype_any_text &&
@ -640,10 +640,10 @@ void GEN_port( dsql_req* request, dsql_msg* message)
}
else if (ENCODE_ODS(request->req_dbb->dbb_ods_version,
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)
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)
{
if (fromCharSet != toCharSet)
parameter->par_desc.setTextType(toCharSet);