bk commit into 5.0 tree (bar:1.1845)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.1845 05/03/25 11:47:25 bar@stripped +1 -0
  func_str.result:
    post-merge fix.
    ,

  mysql-test/r/func_str.result
    1.96 05/03/25 11:45:19 bar@stripped +20 -0
    post-merge fix.
    ,

# 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:	bar
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/bar/mysql-5.0

--- 1.95/mysql-test/r/func_str.result	Fri Mar 25 10:43:11 2005
+++ 1.96/mysql-test/r/func_str.result	Fri Mar 25 11:45:19 2005
@@ -639,6 +639,26 @@
 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