Changeset: 833dda1332e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=833dda1332e3
Modified Files:
        
Branch: default
Log Message:

Merge with Jun2010 branch.


diffs (42 lines):

diff -r 5733c6d8219b -r 833dda1332e3 
sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql
--- a/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql       
Mon Jul 12 19:59:02 2010 +0200
+++ b/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql       
Mon Jul 12 22:04:34 2010 +0200
@@ -5,10 +5,10 @@
 INSERT INTO t1114540 VALUES (11);
 INSERT INTO t1114540 VALUES (12);
 
-SELECT * FROM t1114540 WHERE (id=10) OR (id=11);
-SELECT * FROM t1114540 WHERE ((id=10) OR (id=11)) OR id=12;
-SELECT id FROM t1114540 WHERE id<11 OR id>11;
-SELECT id FROM t1114540 WHERE id>11 OR id<11;
-SELECT id FROM t1114540 WHERE id>=11 OR id<=10;
-SELECT id FROM t1114540 WHERE id>12 OR id<10;
-SELECT id FROM t1114540 WHERE id<11 OR id IS NULL;
+SELECT * FROM t1114540 WHERE (id=10) OR (id=11) ORDER BY id;
+SELECT * FROM t1114540 WHERE ((id=10) OR (id=11)) OR id=12 ORDER BY id;
+SELECT id FROM t1114540 WHERE id<11 OR id>11 ORDER BY id;
+SELECT id FROM t1114540 WHERE id>11 OR id<11 ORDER BY id;
+SELECT id FROM t1114540 WHERE id>=11 OR id<=10 ORDER BY id;
+SELECT id FROM t1114540 WHERE id>12 OR id<10 ORDER BY id;
+SELECT id FROM t1114540 WHERE id<11 OR id IS NULL ORDER BY id;
diff -r 5733c6d8219b -r 833dda1332e3 
sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out
--- 
a/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out    
    Mon Jul 12 19:59:02 2010 +0200
+++ 
b/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out    
    Mon Jul 12 22:04:34 2010 +0200
@@ -51,15 +51,15 @@
 % id # name
 % int # type
 % 2 # length
+[ 10   ]
 [ 12   ]
-[ 10   ]
 % sys.t1114540 # table_name
 % id # name
 % int # type
 % 2 # length
+[ 10   ]
 [ 11   ]
 [ 12   ]
-[ 10   ]
 % sys.t1114540 # table_name
 % id # name
 % int # type
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to