Changeset: c58110adde22 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c58110adde22 Modified Files: Branch: default Log Message:
merge from Jun2010 diffs (105 lines): diff -r 5a45c1b06489 -r c58110adde22 sql/src/test/BugTracker-2009/Tests/leftjoin_undefined.SF-2879011.sql --- a/sql/src/test/BugTracker-2009/Tests/leftjoin_undefined.SF-2879011.sql Tue Jun 15 18:11:01 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/leftjoin_undefined.SF-2879011.sql Tue Jun 15 20:01:23 2010 +0200 @@ -1,7 +1,7 @@ -CREATE TABLE a (name VARCHAR(10)); -CREATE TABLE b (name VARCHAR(10)); -INSERT INTO a VALUES ('a'),('b'); -INSERT INTO b VALUES ('a'),('b'); -SELECT a.name as x, b.name as y FROM a,b WHERE a.name LIKE b.name; -DROP table b; -DROP table a; +CREATE TABLE a1 (name VARCHAR(10)); +CREATE TABLE b1 (name VARCHAR(10)); +INSERT INTO a1 VALUES ('a'),('b'); +INSERT INTO b1 VALUES ('a'),('b'); +SELECT a1.name as x, b1.name as y FROM a1,b1 WHERE a1.name LIKE b1.name; +DROP table b1; +DROP table a1; diff -r 5a45c1b06489 -r c58110adde22 sql/src/test/BugTracker-2009/Tests/leftjoin_undefined.SF-2879011.stable.out --- a/sql/src/test/BugTracker-2009/Tests/leftjoin_undefined.SF-2879011.stable.out Tue Jun 15 18:11:01 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/leftjoin_undefined.SF-2879011.stable.out Tue Jun 15 20:01:23 2010 +0200 @@ -28,7 +28,7 @@ [ 2 ] [ 2 ] -% sys.a, sys.b # table_name +% sys.a1, sys.b1 # table_name % x, y # name % varchar, varchar # type % 1, 1 # length diff -r 5a45c1b06489 -r c58110adde22 sql/src/test/BugTracker-2009/Tests/like_bug.SF-2878994.sql --- a/sql/src/test/BugTracker-2009/Tests/like_bug.SF-2878994.sql Tue Jun 15 18:11:01 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/like_bug.SF-2878994.sql Tue Jun 15 20:01:23 2010 +0200 @@ -1,22 +1,22 @@ -create table a (x varchar(10)); -insert into a values ('aaa'); +create table a2 (x varchar(10)); +insert into a2 values ('aaa'); -create table b (x varchar(10)); -insert into b values ('aaa'); -insert into b values ('aAa'); -insert into b values ('aA'); +create table b2 (x varchar(10)); +insert into b2 values ('aaa'); +insert into b2 values ('aAa'); +insert into b2 values ('aA'); -select a.x from a,b where a.x LIKE b.x; +select a2.x from a2,b2 where a2.x LIKE b2.x; -drop table b; -drop table a; +drop table b2; +drop table a2; -CREATE TABLE a (name VARCHAR(10)); -CREATE TABLE b (name VARCHAR(10)); -INSERT INTO a VALUES ('a'),('b'); -INSERT INTO b VALUES ('a'),('b'); +CREATE TABLE a2 (name VARCHAR(10)); +CREATE TABLE b2 (name VARCHAR(10)); +INSERT INTO a2 VALUES ('a'),('b'); +INSERT INTO b2 VALUES ('a'),('b'); -SELECT a.name as x, b.name as y FROM a,b WHERE a.name LIKE b.name; +SELECT a2.name as x, b2.name as y FROM a2,b2 WHERE a2.name LIKE b2.name; -drop table b; -drop table a; +drop table b2; +drop table a2; diff -r 5a45c1b06489 -r c58110adde22 sql/src/test/BugTracker-2009/Tests/like_bug.SF-2878994.stable.out --- a/sql/src/test/BugTracker-2009/Tests/like_bug.SF-2878994.stable.out Tue Jun 15 18:11:01 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/like_bug.SF-2878994.stable.out Tue Jun 15 20:01:23 2010 +0200 @@ -30,14 +30,14 @@ [ 1 ] [ 1 ] [ 1 ] -% sys.a # table_name +% sys.a2 # table_name % x # name % varchar # type % 3 # length [ "aaa" ] [ 2 ] [ 2 ] -% sys.a, sys.b # table_name +% sys.a2, sys.b2 # table_name % x, y # name % varchar, varchar # type % 1, 1 # length diff -r 5a45c1b06489 -r c58110adde22 sql/src/test/null/Tests/coalesce3.stable.out --- a/sql/src/test/null/Tests/coalesce3.stable.out Tue Jun 15 18:11:01 2010 +0200 +++ b/sql/src/test/null/Tests/coalesce3.stable.out Tue Jun 15 20:01:23 2010 +0200 @@ -45,8 +45,8 @@ [ 2, 2 ] [ 3, 2 ] [ 4, 3 ] +[ 6, 3 ] [ 5, 3 ] -[ 6, 3 ] [ 7, NULL ] [ 8, NULL ] [ 9, NULL ] _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list