Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6958/algebra/opt
Modified Files:
opt_algebra_cse.c
Log Message:
-- Solve conflict. (This fix should align head and stable branch.)
Index: opt_algebra_cse.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_algebra_cse.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- opt_algebra_cse.c 18 Feb 2008 15:54:42 -0000 1.22
+++ opt_algebra_cse.c 18 Feb 2008 16:39:56 -0000 1.23
@@ -1215,8 +1215,8 @@
/* check every item of the column */
for (i = 0; i < littbl1->sem.lit_tbl.count; i++) {
- if (!PFalg_atom_comparable (a[i].atoms[col1], b[i].atoms[col2]) ||
- PFalg_atom_cmp (a[i].atoms[col1], b[i].atoms[col2]) != 0)
+ if (!(PFalg_atom_comparable (a[i].atoms[col1], b[i].atoms[col2]) &&
+ (PFalg_atom_cmp (a[i].atoms[col1], b[i].atoms[col2]) == 0)))
return false;
}
return true;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
