Changeset: a0924b3f92b9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0924b3f92b9
Modified Files:
sql/src/server/rel_bin.mx
sql/src/test/BugTracker-2010/Tests/between-crash.Bug-2672.stable.out
Branch: Oct2010
Log Message:
last step in fixing Bug 2672. The complex join expression was incorrectly
handled as select. Now we correctly use a join2 expression.
diffs (53 lines):
diff -r 273934a5bde0 -r a0924b3f92b9 sql/src/server/rel_bin.mx
--- a/sql/src/server/rel_bin.mx Wed Oct 20 09:17:46 2010 +0200
+++ b/sql/src/server/rel_bin.mx Wed Oct 20 11:02:28 2010 +0200
@@ -591,7 +591,9 @@
return stmt_likeselect(l, r, r2, (comp_type)e->flag);
}
if (left && right && !is_select &&
- (re->card > CARD_ATOM || (l->nrcols && r->nrcols))) {
+ ((l->nrcols && (r->nrcols || (r2 && r2->nrcols))) ||
+ re->card > CARD_ATOM ||
+ (re2 && re2->card > CARD_ATOM))) {
if (l->nrcols == 0)
l =
stmt_const(bin_first_column(swapped?right:left), l);
if (r->nrcols == 0)
diff -r 273934a5bde0 -r a0924b3f92b9
sql/src/test/BugTracker-2010/Tests/between-crash.Bug-2672.stable.out
--- a/sql/src/test/BugTracker-2010/Tests/between-crash.Bug-2672.stable.out
Wed Oct 20 09:17:46 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/between-crash.Bug-2672.stable.out
Wed Oct 20 11:02:28 2010 +0200
@@ -20,13 +20,28 @@
Over..
-# 15:46:07 >
-# 15:46:07 > mclient -lsql -ftest -i -e --host=mane-3 --port=30859
-# 15:46:07 >
+# 10:44:28 >
+# 10:44:28 > mclient -lsql -ftest -i -e --host=alf --port=32184
+# 10:44:28 >
-To be approved when the server stops crashing.
+#create table t2672a (id int);
+#create table t2672b (age int);
+#SELECT
+# id
+#FROM
+# t2672a,
+# t2672b
+#WHERE
+# id between 4800
+# and age = 4863;
+% sys.t2672a # table_name
+% id # name
+% int # type
+% 1 # length
+#drop table t2672a;
+#drop table t2672b;
-# 15:46:07 >
-# 15:46:07 > Done.
-# 15:46:07 >
+# 10:44:28 >
+# 10:44:28 > Done.
+# 10:44:28 >
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
