bk commit into 5.0 tree (evgen:1.1973)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1973 05/11/18 17:26:44 evgen@stripped +2 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0
  into moonbone.local:/work/13622-bug-5.0-mysql

  mysql-test/t/view.test
    1.126 05/11/18 17:26:43 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/view.result
    1.136 05/11/18 17:26:43 evgen@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/13622-bug-5.0-mysql/RESYNC

--- 1.135/mysql-test/r/view.result	2005-11-18 01:16:13 +03:00
+++ 1.136/mysql-test/r/view.result	2005-11-18 17:26:43 +03:00
@@ -204,6 +204,21 @@
 insert into t1 values (1), (2), (3);
 create view v1 (a) as select a+1 from t1;
 create view v2 (a) as select a-1 from t1;
+select * from t1 natural left join v1;
+a
+1
+2
+3
+select * from v2 natural left join t1;
+a
+0
+1
+2
+select * from v2 natural left join v1;
+a
+0
+1
+2
 drop view v1, v2;
 drop table t1;
 create table t1 (a int);

--- 1.125/mysql-test/t/view.test	2005-11-18 01:16:13 +03:00
+++ 1.126/mysql-test/t/view.test	2005-11-18 17:26:43 +03:00
@@ -147,11 +147,9 @@
 create view v1 (a) as select a+1 from t1;
 create view v2 (a) as select a-1 from t1;
 
---disable_parsing # WL #2486 should enable these tests
 select * from t1 natural left join v1;
 select * from v2 natural left join t1;
 select * from v2 natural left join v1;
---enable_parsing
 
 drop view v1, v2;
 drop table t1;