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

Misc.

Browse Source
This commit is contained in:
robocop 2010-01-15 04:57:57 +00:00
parent c029122fef
commit 50f1ad96e2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dsql/StmtNodes.cpp
View File

@ -731,7 +731,7 @@ DmlNode* ExceptionNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch
if (type == blr_exception_params) if (type == blr_exception_params)
{ {
USHORT count = csb->csb_blr_reader.getWord(); const USHORT count = csb->csb_blr_reader.getWord();
node->parameters = PAR_make_node(tdbb, count); node->parameters = PAR_make_node(tdbb, count);
node->parameters->nod_type = nod_list; node->parameters->nod_type = nod_list;
@ -781,7 +781,7 @@ void ExceptionNode::genBlr()
return; return;
} }
// If exception parameters or value is defined, it means we have user-defined exception message // If exception value is defined, it means we have user-defined exception message
// here, so blr_exception_msg verb should be generated. // here, so blr_exception_msg verb should be generated.
if (dsqlParameters) if (dsqlParameters)
stuff(statement, blr_exception_params); stuff(statement, blr_exception_params);

6
src/jrd/recsrc/MergeJoin.cpp
View File

@ -450,11 +450,13 @@ int MergeJoin::compare(thread_db* tdbb, jrd_nod* node1, jrd_nod* node2)
{ {
return -1; return -1;
} }
else if (null2 && !null1)
if (null2 && !null1)
{ {
return 1; return 1;
} }
else if (!null1 && !null2)
if (!null1 && !null2)
{ {
const int result = MOV_compare(desc1, desc2); const int result = MOV_compare(desc1, desc2);