bk commit into 5.0 tree (evgen:1.1899)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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.1899 05/08/22 15:46:09 evgen@stripped +2 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0
  into moonbone.local:/work/11398-bug-5.0-mysql

  mysql-test/t/select.test
    1.65 05/08/22 15:46:06 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/select.result
    1.80 05/08/22 15:46:06 evgen@stripped +0 -0
    Auto merged

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/11398-bug-5.0-mysql/RESYNC

--- 1.79/mysql-test/r/select.result	2005-08-18 06:56:11 +04:00
+++ 1.80/mysql-test/r/select.result	2005-08-22 15:46:06 +04:00
@@ -2756,3 +2756,12 @@
 select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;
 x'10' + 0	X'10' + 0	b'10' + 0	B'10' + 0
 16	16	2	2
+create table t1 (f1 varchar(6) default NULL, f2 int(6) primary key not null);
+create table t2 (f3 varchar(5) not null, f4 varchar(5) not null, UNIQUE KEY UKEY (f3,f4));
+insert into t1 values (" 2", 2);
+insert into t2 values (" 2", " one "),(" 2", " two ");
+select * from t1 left join t2 on f1 = f3;
+f1	f2	f3	f4
+ 2	2	 2	 one 
+ 2	2	 2	 two 
+drop table t1,t2;

--- 1.64/mysql-test/t/select.test	2005-08-18 06:56:11 +04:00
+++ 1.65/mysql-test/t/select.test	2005-08-22 15:46:06 +04:00
@@ -2348,3 +2348,13 @@
 #
 
 select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;
+
+#
+# Bug #11398 Bug in field_conv() results in wrong result of join with index
+#
+create table t1 (f1 varchar(6) default NULL, f2 int(6) primary key not null);
+create table t2 (f3 varchar(5) not null, f4 varchar(5) not null, UNIQUE KEY UKEY (f3,f4));
+insert into t1 values (" 2", 2);
+insert into t2 values (" 2", " one "),(" 2", " two ");
+select * from t1 left join t2 on f1 = f3;
+drop table t1,t2;