bk commit into 5.1 tree (gkodinov:1.2154)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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.2154 06/05/17 13:29:20 gkodinov@stripped +3 -0
  Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge
  into  mysql.com:/home/kgeorge/mysql/5.1/merge

  sql/item_subselect.cc
    1.123 06/05/17 13:29:13 gkodinov@stripped +0 -0
    Auto merged

  mysql-test/r/view.result
    1.159 06/05/17 13:29:12 gkodinov@stripped +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.145 06/05/17 13:29:12 gkodinov@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:	gkodinov
# Host:	rakia.(none)
# Root:	/home/kgeorge/mysql/5.1/merge/RESYNC

--- 1.144/mysql-test/r/subselect.result	2006-05-13 21:39:04 +03:00
+++ 1.145/mysql-test/r/subselect.result	2006-05-17 13:29:12 +03:00
@@ -3169,3 +3169,11 @@
 insert into t2 values (2, 1), (1, 0);
 delete from t1 where c <= 1140006215 and (select b from t2 where a = 2) = 1;
 drop table t1, t2;
+CREATE TABLE t1 (a INT);
+CREATE VIEW v1 AS SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
+ERROR 42S22: Unknown column 'no_such_column' in 'where clause'
+CREATE VIEW v2 AS SELECT * FROM t1 WHERE no_such_column = (SELECT 1);
+ERROR 42S22: Unknown column 'no_such_column' in 'where clause'
+SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+DROP TABLE t1;

--- 1.158/mysql-test/r/view.result	2006-04-26 17:28:24 +03:00
+++ 1.159/mysql-test/r/view.result	2006-05-17 13:29:12 +03:00
@@ -706,7 +706,7 @@
 create view v2 as select a from t2 where a in (select a from v1);
 show create view v2;
 View	Create View
-v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t2`.`a` AS `a` from `t2` where `a` in (select `v1`.`a` AS `a` from `v1`)
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t2`.`a` AS `a` from `t2` where `t2`.`a` in (select `v1`.`a` AS `a` from `v1`)
 drop view v2, v1;
 drop table t1, t2;
 CREATE VIEW `v 1` AS select 5 AS `5`;

--- 1.122/sql/item_subselect.cc	2006-04-30 23:13:54 +03:00
+++ 1.123/sql/item_subselect.cc	2006-05-17 13:29:13 +03:00
@@ -1354,6 +1354,17 @@
 }
 
 
+bool Item_in_subselect::fix_fields(THD *thd, Item **ref)
+{
+  bool result = 0;
+  
+  if(thd->lex->view_prepare_mode && left_expr && !left_expr->fixed)
+    result = left_expr->fix_fields(thd, &left_expr);
+
+  return result || Item_subselect::fix_fields(thd, ref);
+}
+
+
 Item_subselect::trans_res
 Item_allany_subselect::select_transformer(JOIN *join)
 {