Changeset: 700a8fc9c911 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=700a8fc9c911
Modified Files:
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (38 lines):

diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single 
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
@@ -45,7 +45,7 @@ Ready.
 % mal # name
 % clob # type
 % 173 # length
-function user.s0_1():void;
+function user.s2_1():void;
     X_1 := sql.mvc();
     X_2:bat[:oid,:oid]  := sql.tid(X_1,"sys","treeitems");
     X_5 := sql.bind(X_1,"sys","treeitems","pre",0);
@@ -53,17 +53,18 @@ function user.s0_1():void;
     X_9 := sql.bind(X_1,"sys","treeitems","size",0);
     X_11 := algebra.leftfetchjoin(X_2,X_9);
     X_12:bat[:oid,:lng]  := batcalc.+(X_8,X_11);
-    (X_13,r1_40) := algebra.join(X_8,X_8,X_12,true,true);
+    (X_13,r1_41) := algebra.join(X_8,X_8,X_12,true,true);
     X_16 := sql.bind(X_1,"sys","treeitems","subject",0);
     X_21 := algebra.leftfetchjoin(X_2,X_16);
-    X_22 := algebra.leftfetchjoin(r1_40,X_21);
+    X_22 := algebra.leftfetchjoin(r1_41,X_21);
     X_24 := algebra.leftfetchjoin(X_13,X_21);
     X_26 := sql.resultSet(2,1,X_22);
-    sql.rsColumn(X_26,"sys.t1","id1","int",32,0,X_22);
-    sql.rsColumn(X_26,"sys.t2","id2","int",32,0,X_24);
-    X_36 := io.stdout();
-    sql.exportResult(X_36,X_26);
-end s0_1;
+    sql.rsColumn(X_26,"sys.L","id1","int",32,0,X_22);
+    sql.rsColumn(X_26,"sys.L","id2","int",32,0,X_24);
+    X_35 := io.stdout();
+    sql.exportResult(X_35,X_26);
+end s2_1;
+# querylog.define("explain\nselect t1.subject as id1, t2.subject as id2\nfrom  
treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre + 
t1.size;","default_pipe")
 #ROLLBACK;
 
 # 20:18:31 >  
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to