Commit 86ec89c1 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.1-opt 

into  mysql.com:/home/hf/work/mysql-5.1.20835


mysql-test/t/subselect.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
parents bfee156a e8b32b2b

mysql-test/r/subselect.result

+6 −0
Original line number Diff line number Diff line
@@ -3592,3 +3592,9 @@ FROM t1) t; 
COUNT(*)

3000

DROP TABLE t1,t2;

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

s1

a

DROP TABLE t1;

mysql-test/t/subselect.test

+8 −0
Original line number Diff line number Diff line
@@ -2496,3 +2496,11 @@ SELECT SQL_NO_CACHE COUNT(*) 
          FROM t1) t;



DROP TABLE t1,t2;



#

# Bug#20835 (literal string with =any values)

#

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

DROP TABLE t1;

sql/item_cmpfunc.cc

+2 −1
Original line number Diff line number Diff line
@@ -797,7 +797,8 @@ bool Item_in_optimizer::fix_left(THD *thd, Item **ref) 
  }

  not_null_tables_cache= args[0]->not_null_tables();

  with_sum_func= args[0]->with_sum_func;

  const_item_cache= args[0]->const_item();

  if ((const_item_cache= args[0]->const_item()))

    cache->store(args[0]);

  return 0;

}