Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15700
Modified Files:
rel_select.mx sql_rel2bin.mx
Log Message:
cmp_* order apparently is important in more places, so since the order was now
settled, restore the original loop
U sql_rel2bin.mx
Index: sql_rel2bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_rel2bin.mx,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- sql_rel2bin.mx 1 Aug 2009 14:47:46 -0000 1.136
+++ sql_rel2bin.mx 2 Aug 2009 13:06:57 -0000 1.137
@@ -595,20 +595,9 @@
}
/* finally collect all saved like, notlike, and
notequal selects */
- {
- comp_type *ctp;
- comp_type cts[] = {
- cmp_ilike,
- cmp_notilike,
- cmp_like,
- cmp_notlike,
- cmp_notequal,
- (comp_type)0
- };
- for (ctp = cts; *ctp != (comp_type)0; ctp++) {
- list_merge(newsels, sels1[*ctp], (fdup)
&stmt_dup);
- list_destroy(sels1[*ctp]);
- }
+ for (ct = cmp_ilike; ct >= cmp_notequal; ct--) {
+ list_merge(newsels, sels1[ct], (fdup)&stmt_dup);
+ list_destroy(sels1[ct]);
}
}
list_destroy(colsels);
U rel_select.mx
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- rel_select.mx 1 Aug 2009 18:32:39 -0000 1.151
+++ rel_select.mx 2 Aug 2009 13:06:56 -0000 1.152
@@ -2953,7 +2953,8 @@
sql_exp *
-rel_binop_(mvc *sql, sql_exp *l, sql_exp *r, sql_schema *s, char *fname, int
table_func)
+rel_binop_(mvc *sql, sql_exp *l, sql_exp *r, sql_schema *s,
+ char *fname, int table_func)
{
sql_exp *res = NULL;
sql_subtype *t1, *t2;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
