bzr push into mysql-5.5 branch (chaithra.gopalareddy:3727 to 3728)

[Chaithra Gopalareddy]

 3728 Chaithra Gopalareddy	2012-02-24 [merge]
      Merge from 5.1 to 5.5

    modified:
      mysql-test/r/func_in.result
      mysql-test/t/func_in.test
      sql/item_cmpfunc.h
 3727 Vasil Dimov	2012-02-21 [merge]
      Merge mysql-5.1 -> mysql-5.5

    modified:
      mysql-test/suite/innodb/t/innodb_bug34300.test
=== modified file 'mysql-test/r/func_in.result'
--- a/mysql-test/r/func_in.result	2012-01-25 09:36:25 +0000
+++ b/mysql-test/r/func_in.result	2012-02-24 06:25:28 +0000
@@ -778,4 +778,14 @@ SELECT 1 IN (YEAR(FROM_UNIXTIME(NULL)) ,
 1 IN (YEAR(FROM_UNIXTIME(NULL)) ,1)
 1
 #
+#
+# Bug#13012483: EXPLAIN EXTENDED, PREPARED STATEMENT, CRASH IN CHECK_SIMPLE_EQUALITY
+#
+CREATE TABLE t1 (a INT);
+PREPARE s FROM "SELECT 1 FROM t1 WHERE 1 < ALL (SELECT @:= (1 IN (SELECT 1 FROM t1)) FROM t1)";
+EXECUTE s;
+1
+DROP TABLE t1;
+# End of test  BUG#13012483
+#
 End of 5.1 tests

=== modified file 'mysql-test/t/func_in.test'
--- a/mysql-test/t/func_in.test	2011-04-12 09:51:36 +0000
+++ b/mysql-test/t/func_in.test	2012-02-24 06:23:36 +0000
@@ -562,4 +562,17 @@ SELECT 1 IN (YEAR(FROM_UNIXTIME(NULL)) ,
 
 --echo #
 
+--echo #
+--echo # Bug#13012483: EXPLAIN EXTENDED, PREPARED STATEMENT, CRASH IN CHECK_SIMPLE_EQUALITY
+--echo #
+
+CREATE TABLE t1 (a INT);
+PREPARE s FROM "SELECT 1 FROM t1 WHERE 1 < ALL (SELECT @:= (1 IN (SELECT 1 FROM t1)) FROM t1)";
+EXECUTE s;
+
+DROP TABLE t1;
+
+--echo # End of test  BUG#13012483
+
+--echo #
 --echo End of 5.1 tests

=== modified file 'sql/item_cmpfunc.h'
--- a/sql/item_cmpfunc.h	2012-02-16 09:48:16 +0000
+++ b/sql/item_cmpfunc.h	2012-02-24 06:25:28 +0000
@@ -271,7 +271,7 @@ public:
   Item_in_optimizer(Item *a, Item_in_subselect *b):
     Item_bool_func(a, reinterpret_cast<Item *>(b)), cache(0),
     save_cache(0), result_for_null_param(UNKNOWN)
-  {}
+  { with_subselect= true; }
   bool fix_fields(THD *, Item **);
   bool fix_left(THD *thd, Item **ref);
   bool is_null();

No bundle (reason: useless for push emails).