bk commit into 5.0 tree (timour:1.1909) BUG#10972

[timour]

Below is the list of changes that have just been committed into a local
5.0 repository of timka. When timka 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.1909 05/08/23 19:00:28 timour@stripped +2 -0
  Test case for BUG#10972 - Natural join of view and underlying table gives wrong result.
  
  The bug itself is fixed by WL#2486.

  mysql-test/t/select.test
    1.69 05/08/23 19:00:25 timour@stripped +12 -0
    Test case for BUG#10972.

  mysql-test/r/select.result
    1.84 05/08/23 19:00:25 timour@stripped +11 -0
    Test case for BUG#10972.

# 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:	timour
# Host:	lamia.home
# Root:	/home/timka/mysql/src/5.0-2486

--- 1.83/mysql-test/r/select.result	2005-08-23 18:43:08 +03:00
+++ 1.84/mysql-test/r/select.result	2005-08-23 19:00:25 +03:00
@@ -2818,3 +2818,14 @@
 select pk from t1 inner join t2 using (pk);
 pk
 drop table t1,t2;
+create table t1 (s1 int, s2 char(5), s3 decimal(10));
+create view v1 as select s1, s2, 'x' as s3 from t1;
+select * from t1 natural join v1;
+s1	s2	s3
+insert into t1 values (1,'x',5);
+select * from t1 natural join v1;
+s1	s2	s3
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: 'x'
+drop table t1;
+drop view v1;

--- 1.68/mysql-test/t/select.test	2005-08-23 18:43:08 +03:00
+++ 1.69/mysql-test/t/select.test	2005-08-23 19:00:25 +03:00
@@ -2394,3 +2394,15 @@
 create table t2 (pk int primary key, c int);
 select pk from t1 inner join t2 using (pk);
 drop table t1,t2;
+
+#
+# Bug #10972 Natural join of view and underlying table gives wrong result
+#
+
+create table t1 (s1 int, s2 char(5), s3 decimal(10));
+create view v1 as select s1, s2, 'x' as s3 from t1;
+select * from t1 natural join v1;
+insert into t1 values (1,'x',5);
+select * from t1 natural join v1;
+drop table t1;
+drop view v1;