Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26395/src/server
Modified Files:
Tag: Aug2009
rel_select.mx
Log Message:
corrected the error message for except
U rel_select.mx
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.152.2.2
retrieving revision 1.152.2.3
diff -u -d -r1.152.2.2 -r1.152.2.3
--- rel_select.mx 7 Aug 2009 14:26:12 -0000 1.152.2.2
+++ rel_select.mx 7 Aug 2009 15:34:18 -0000 1.152.2.3
@@ -4656,12 +4656,16 @@
rel_remove_internal_exp(t1);
rel_remove_internal_exp(t2);
if (list_length(t1->exps) != list_length(t2->exps)) {
+ int t1nrcols = list_length(t1->exps);
+ int t2nrcols = list_length(t2->exps);
char *op = "UNION";
if (q->token == SQL_EXCEPT)
op = "EXCEPT";
else if (q->token == SQL_INTERSECT)
op = "INTERSECT";
- return sql_error(sql, 02, "%s: column counts (%d and %d) do not
match", op, t1->nrcols, t2->nrcols);
+ rel_destroy(t1);
+ rel_destroy(t2);
+ return sql_error(sql, 02, "%s: column counts (%d and %d) do not
match", op, t1nrcols, t2nrcols);
}
if (t1 && dist)
t1 = rel_distinct(t1);
------------------------------------------------------------------------------
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
