diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-03-30 16:04:08 +0500 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-03-30 16:04:08 +0500 |
| commit | b26165d3a2eeb748b9bd5573f9bac7b73d5f9a37 (patch) | |
| tree | cf443dc3eac52560811d190ab47d14c108fcae62 /mysql-test | |
| parent | ceeaa24d187b228fd6e8b1ac1e667d341155640f (diff) | |
| parent | 3004dc7ef27ee96f7b1ccf2868009e035f7cff06 (diff) | |
| download | mariadb-git-b26165d3a2eeb748b9bd5573f9bac7b73d5f9a37.tar.gz | |
resolving conflicts
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/join.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/join_outer.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 7dbc09f9cc0..f9e49c40dc1 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -277,11 +277,11 @@ CREATE TABLE t2 (ID INTEGER NOT NULL PRIMARY KEY, Value2 VARCHAR(255)); INSERT INTO t1 VALUES (1, 'A'); INSERT INTO t2 VALUES (1, 'B'); SELECT * FROM t1 NATURAL JOIN t2 WHERE 1 AND (Value1 = 'A' AND Value2 <> 'B'); -ID Value1 ID Value2 +ID Value1 Value2 SELECT * FROM t1 NATURAL JOIN t2 WHERE 1 AND Value1 = 'A' AND Value2 <> 'B'; -ID Value1 ID Value2 +ID Value1 Value2 SELECT * FROM t1 NATURAL JOIN t2 WHERE (Value1 = 'A' AND Value2 <> 'B') AND 1; -ID Value1 ID Value2 +ID Value1 Value2 drop table t1,t2; create table t1 (i int); create table t2 (i int); diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index c40f86827f8..9d7c3d98952 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -124,8 +124,8 @@ grp a c id a c d 3 5 C 3 5 B 5 3 6 D 3 6 C 6 select t1.*,t2.* from t1 natural join t2; -grp a c id a c d -1 1 a 1 1 a 1 +grp a c id d +1 1 a 1 1 drop table t1,t2; CREATE TABLE t1 ( usr_id INT unsigned NOT NULL, @@ -467,10 +467,10 @@ count color 15 white 7 green select * from t2 natural join t1; -count color color name -10 green green lime -7 green green lime -5 black black grape +count color name +10 green lime +7 green lime +5 black grape select t2.count, t1.name from t2 natural join t1; count name 10 lime diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index a940e0f2e95..43c41378f30 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -2279,10 +2279,10 @@ a a a 2 2 2 3 3 3 select * from t1 natural join (t1 as t2 left join t1 as t3 using (a)); -a a a -1 1 1 -2 2 2 -3 3 3 +a a +1 1 +2 2 +3 3 select * from (t1 as t2 left join t1 as t3 using (a)) natural join t1; a a a 1 1 1 |