bk commit into 4.1 tree (bar:1.2481) BUG#13751

[bar]

Below is the list of changes that have just been committed into a local
4.1 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.2481 05/10/07 09:52:15 bar@stripped +3 -0
  ctype_utf8.result, ctype_utf8.test:
    Adding test case.
  item_func.cc:
    Bug#13751 find_in_set: Illegal mix of collations.
    Character set conversion was forgotten in find_in_set.

  mysql-test/r/ctype_utf8.result
    1.66 05/10/07 09:51:55 bar@stripped +5 -0
    Adding test case.

  mysql-test/t/ctype_utf8.test
    1.68 05/10/07 09:51:46 bar@stripped +8 -0
    Adding test case.

  sql/item_func.cc
    1.255 05/10/07 09:50:32 bar@stripped +1 -1
    Bug#13751 find_in_set: Illegal mix of collations.
    Character set conversion was forgotten in find_in_set.

# 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:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1.b13751

--- 1.254/sql/item_func.cc	2005-09-06 16:19:16 +05:00
+++ 1.255/sql/item_func.cc	2005-10-07 09:50:32 +05:00
@@ -1454,7 +1454,7 @@
       }
     }
   }
-  agg_arg_collations_for_comparison(cmp_collation, args, 2);
+  agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV);
 }
 
 static const char separator=',';

--- 1.65/mysql-test/r/ctype_utf8.result	2005-09-21 22:17:30 +05:00
+++ 1.66/mysql-test/r/ctype_utf8.result	2005-10-07 09:51:55 +05:00
@@ -1056,3 +1056,8 @@
 5B
 E880BD
 drop table t1;
+set names 'latin1';
+create table t1 (a varchar(255)) default charset=utf8;
+select * from t1 where find_in_set('-1', a);
+a
+drop table t1;

--- 1.67/mysql-test/t/ctype_utf8.test	2005-09-21 22:13:38 +05:00
+++ 1.68/mysql-test/t/ctype_utf8.test	2005-10-07 09:51:46 +05:00
@@ -865,4 +865,12 @@
 select hex(a) from t1;
 drop table t1;
 
+#
+# Bug#13751 find_in_set: Illegal mix of collations
+#
+set names 'latin1';
+create table t1 (a varchar(255)) default charset=utf8;
+select * from t1 where find_in_set('-1', a);
+drop table t1;
+
 # End of 4.1 tests