summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@deer.(none)>2006-12-06 12:56:11 +0400
committerunknown <holyfoot/hf@deer.(none)>2006-12-06 12:56:11 +0400
commit86ec89c11a1f75a08943c80b5c1c87b7192f5999 (patch)
tree32775062d5999b7debde14c258b8bb289eb0108e /mysql-test
parentbfee156a8b9ef5679fc7b4751ac6b1cffb8f7e39 (diff)
parente8b32b2b01e28926867d12ca3c0f8dc33690db5b (diff)
downloadmariadb-git-86ec89c11a1f75a08943c80b5c1c87b7192f5999.tar.gz
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
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/subselect.result6
-rw-r--r--mysql-test/t/subselect.test8
2 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index a4c666dd876..ee057695cd1 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -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;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 0bbbc5a793e..2f65ee44d3c 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -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;