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

Fixed problem which caused complex outer joins to produce wrong results

Browse Source
This commit is contained in:
skidder 2002-10-12 19:39:19 +00:00
parent fa84569d98
commit b4cb6b07ff
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jrd/opt.cpp
View File

@ -27,7 +27,7 @@
* stored procedure doesn't access tables, views or other procedures directly. * stored procedure doesn't access tables, views or other procedures directly.
*/ */
/* /*
$Id: opt.cpp,v 1.13 2002-09-25 17:12:10 skidder Exp $ $Id: opt.cpp,v 1.14 2002-10-12 19:39:19 skidder Exp $
*/ */
#include "firebird.h" #include "firebird.h"
@ -441,9 +441,18 @@ RSB OPT_compile(TDBB tdbb,
compute_rse_streams(csb, (RSE) node, beds); compute_rse_streams(csb, (RSE) node, beds);
compute_rse_streams(csb, (RSE) node, local_streams); compute_rse_streams(csb, (RSE) node, local_streams);
compute_dbkey_streams(csb, node, key_streams); compute_dbkey_streams(csb, node, key_streams);
*stack_end = parent_stack; /* pass rse boolean only to inner substreams because join condition
rsb = OPT_compile(tdbb, csb, (RSE) node, conjunct_stack); should never exclude records from outer substreams */
*stack_end = NULL; if ( rse->rse_jointype==blr_inner ||
(rse->rse_jointype==blr_left && (ptr - rse->rse_relation)==1) ||
(rse->rse_jointype==blr_right && (ptr - rse->rse_relation)==0) )
{
*stack_end = parent_stack;
rsb = OPT_compile(tdbb, csb, (RSE) node, conjunct_stack);
*stack_end = NULL;
} else {
rsb = OPT_compile(tdbb, csb, (RSE) node, parent_stack);
}
} }
/* if an rsb has been generated, we have a non-relation; /* if an rsb has been generated, we have a non-relation;