Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28679/server
Modified Files:
Tag: SQL_2-20
sql_select.mx
Log Message:
m4 use dynamic hash sizes for group by over columns with type oid
fixes for select .. from x where ... and true.
both fixes were needed for
[ 1796269 ] SQL: hangs/crashes on 'exists' subqueries after a join
Index: sql_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_select.mx,v
retrieving revision 1.202.2.1
retrieving revision 1.202.2.2
diff -u -d -r1.202.2.1 -r1.202.2.2
--- sql_select.mx 30 Oct 2007 18:54:13 -0000 1.202.2.1
+++ sql_select.mx 19 Nov 2007 18:10:30 -0000 1.202.2.2
@@ -3473,7 +3473,12 @@
stmt *t = NULL;
int found = 1;
- if (!(t = scope_bind(scp, NULL, "row"))) {
+ if (scp->tables->h) {
+ cvar *c = scope_first_column(scp);
+ stmt *b = stmt_bool(1);
+ t = stmt_const(stmt_dup(c->s), b);
+ found = 0;
+ } else if (!(t = scope_bind(scp, NULL, "row"))) {
stmt *b = stmt_bool(1);
t = stmt_temp(bt);
/* fake column needs fake base table too */
@@ -3715,7 +3720,7 @@
}
if (!cur)
return s;
- if ((t = scope_bind(scp, NULL, "row")) != NULL) {
+ if ((t = scope_bind(scp, NULL, "row")) != NULL && t->nrcols == 0) {
t = stmt_join(stmt_dup(cur), stmt_reverse(t), cmp_all);
s = sql_and(sql, scp, s, t, sql_where);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
