From 9fbfa7a9af9c9d1d7171d9940a28be2ec77354b2 Mon Sep 17 00:00:00 2001
From: "bar@eagle.intranet.mysql.r18.ru" <>
Date: Fri, 25 Mar 2005 11:47:25 +0400
Subject: [PATCH] func_str.result:   post-merge fix.   ,

---
 mysql-test/r/func_str.result | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 15a650eccfa..1c2cfeca01e 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -639,6 +639,26 @@ drop table t1;
 select charset(null), collation(null), coercibility(null);
 charset(null)	collation(null)	coercibility(null)
 binary	binary	5
+CREATE TABLE t1 (a int, b int);
+CREATE TABLE t2 (a int, b int);
+INSERT INTO t1 VALUES (1,1),(2,2);
+INSERT INTO t2 VALUES (2,2),(3,3);
+select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)
+where collation(t2.a) = _utf8'binary' order by t1.a,t2.a;
+a	b	a	b
+1	1	NULL	NULL
+2	2	2	2
+select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)
+where charset(t2.a) = _utf8'binary' order by t1.a,t2.a;
+a	b	a	b
+1	1	NULL	NULL
+2	2	2	2
+select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)
+where coercibility(t2.a) = 2 order by t1.a,t2.a;
+a	b	a	b
+1	1	NULL	NULL
+2	2	2	2
+DROP TABLE t1, t2;
 select SUBSTR('abcdefg',3,2);
 SUBSTR('abcdefg',3,2)
 cd