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

Fixed bug CORE-5695 : Position function does not consider the collation for blob

Browse Source
This commit is contained in:
hvlad 2018-01-09 12:28:34 +02:00
parent 3dd5a234c1
commit 0d8ee0e1b3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/dsc.h
View File

@ -228,6 +228,14 @@ typedef struct dsc
memset(this, 0, sizeof(*this)); memset(this, 0, sizeof(*this));
} }
void clearFlags()
{
if (isBlob() && dsc_sub_type == isc_blob_text)
dsc_flags &= 0xFF00;
else
dsc_flags = 0;
}
void makeBlob(SSHORT subType, USHORT ttype, ISC_QUAD* address = NULL) void makeBlob(SSHORT subType, USHORT ttype, ISC_QUAD* address = NULL)
{ {
clear(); clear();

2
src/dsql/StmtNodes.cpp
View File

@ -1996,7 +1996,7 @@ const StmtNode* DeclareVariableNode::execute(thread_db* tdbb, jrd_req* request,
{ {
impure_value* variable = request->getImpure<impure_value>(impureOffset); impure_value* variable = request->getImpure<impure_value>(impureOffset);
variable->vlu_desc = varDesc; variable->vlu_desc = varDesc;
variable->vlu_desc.dsc_flags = 0; variable->vlu_desc.clearFlags();
if (variable->vlu_desc.dsc_dtype <= dtype_varying) if (variable->vlu_desc.dsc_dtype <= dtype_varying)
{ {