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

One more bugfix for full outer joins.

Browse Source
This commit is contained in:
dimitr 2013-04-30 15:27:51 +00:00
parent 116d28e3ab
commit 040650b750
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jrd/opt.cpp
View File

@ -2161,10 +2161,12 @@ static RecordSource* gen_outer(thread_db* tdbb, OptimizerBlk* opt, RseNode* rse,
if (!hasOuterRsb)
csb->csb_rpt[stream_o.stream_num].deactivate();
boolean = NULL;
if (!hasInnerRsb)
{
stream_i.stream_rsb =
gen_retrieval(tdbb, opt, stream_i.stream_num, NULL, false, false, NULL);
gen_retrieval(tdbb, opt, stream_i.stream_num, NULL, true, false, &boolean);
}
if (!hasOuterRsb)
@ -2176,7 +2178,7 @@ static RecordSource* gen_outer(thread_db* tdbb, OptimizerBlk* opt, RseNode* rse,
RecordSource* const outerRsb = gen_residual_boolean(tdbb, opt, stream_o.stream_rsb);
RecordSource* const rsb2 = FB_NEW(*tdbb->getDefaultPool())
NestedLoopJoin(csb, stream_i.stream_rsb, outerRsb, NULL, false, true);
NestedLoopJoin(csb, stream_i.stream_rsb, outerRsb, boolean, false, true);
return FB_NEW(*tdbb->getDefaultPool()) FullOuterJoin(csb, rsb1, rsb2);
}