bk commit into 5.0 tree (tsmith:1.2230)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tim. When tim 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@stripped, 2006-08-23 18:24:59-06:00, tsmith@stripped +4 -0
  Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
  into  siva.hindu.god:/usr/home/tim/m/bk/beef-50
  MERGE: 1.1616.2670.8

  mysql-test/r/func_misc.result@stripped, 2006-08-23 18:24:56-06:00, tsmith@stripped +1 -0
    Manual merge
    MERGE: 1.16.1.4

  mysql-test/t/func_misc.test@stripped, 2006-08-23 18:24:56-06:00, tsmith@stripped +4 -1
    Manual merge
    MERGE: 1.11.1.5

  sql/item_func.h@stripped, 2006-08-23 18:24:56-06:00, tsmith@stripped +1 -1
    Manual merge
    MERGE: 1.68.21.1

  sql/item_strfunc.cc@stripped, 2006-08-23 18:24:56-06:00, tsmith@stripped +0 -2
    Manual merge
    MERGE: 1.196.10.2

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/beef-50/RESYNC

--- 1.23/mysql-test/r/func_misc.result	2006-08-23 18:25:06 -06:00
+++ 1.24/mysql-test/r/func_misc.result	2006-08-23 18:25:06 -06:00
@@ -87,6 +87,10 @@ SELECT IS_USED_LOCK('bug16501');
 IS_USED_LOCK('bug16501')
 NULL
 DROP TABLE t1;
+select export_set(3, _latin1'foo', _utf8'bar', ',', 4);
+export_set(3, _latin1'foo', _utf8'bar', ',', 4)
+foo,foo,bar,bar
+End of 4.1 tests
 create table t1 as select uuid(), length(uuid());
 show create table t1;
 Table	Create Table
@@ -130,3 +134,4 @@ timediff(b, a) >= '00:00:03'
 drop table t2;
 drop table t1;
 set global query_cache_size=default;
+End of 5.0 tests

--- 1.18/mysql-test/t/func_misc.test	2006-08-23 18:25:06 -06:00
+++ 1.19/mysql-test/t/func_misc.test	2006-08-23 18:25:06 -06:00
@@ -78,7 +78,13 @@ connection default;
 
 DROP TABLE t1;
 
-# End of 4.1 tests
+#
+# Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
+#
+select export_set(3, _latin1'foo', _utf8'bar', ',', 4);
+
+--echo End of 4.1 tests
+
 
 #
 # Test for BUG#9535
@@ -87,7 +93,9 @@ create table t1 as select uuid(), length
 show create table t1;
 drop table t1;
 
+#
 # Bug #6760: Add SLEEP() function
+#
 create table t1 (a timestamp default '2005-05-05 01:01:01',
                  b timestamp default '2005-05-05 01:01:01');
 insert into t1 set a = now();
@@ -117,4 +125,4 @@ drop table t2;
 drop table t1;
 set global query_cache_size=default;
 
-# End of 5.0 tests
+--echo End of 5.0 tests