bk commit into 5.0 tree (rburnett:1.2237)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of rburnett. When rburnett 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-16 16:04:10+02:00, rburnett@stripped +2 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
  into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
  MERGE: 1.2216.1.41

  mysql-test/r/ctype_utf8.result@stripped, 2006-08-16 16:04:05+02:00, rburnett@stripped +0 -0
    Auto merged
    MERGE: 1.92.1.1

  mysql-test/t/ctype_utf8.test@stripped, 2006-08-16 16:04:05+02:00, rburnett@stripped +0 -0
    Auto merged
    MERGE: 1.85.1.1

# 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:	rburnett
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.0-kt/RESYNC

--- 1.93/mysql-test/r/ctype_utf8.result	2006-08-16 16:04:18 +02:00
+++ 1.94/mysql-test/r/ctype_utf8.result	2006-08-16 16:04:18 +02:00
@@ -1293,6 +1293,22 @@
 DROP TABLE t1;
+create table t1(a char(200) collate utf8_unicode_ci NOT NULL default '')
+default charset=utf8 collate=utf8_unicode_ci;
+insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));
+explain select distinct a from t1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary
+select distinct a from t1;
+a
+e
+explain select a from t1 group by a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary; Using filesort
+select a from t1 group by a;
+a
+e
+drop table t1;
 CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;
 INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');
 SELECT id FROM t1;

--- 1.86/mysql-test/t/ctype_utf8.test	2006-08-16 16:04:18 +02:00
+++ 1.87/mysql-test/t/ctype_utf8.test	2006-08-16 16:04:18 +02:00
@@ -1037,6 +1037,20 @@
 
 DROP TABLE t1;
+
+#
+# Bug 20709: problem with utf8 fields in temporary tables
+#
+
+create table t1(a char(200) collate utf8_unicode_ci NOT NULL default '')
+  default charset=utf8 collate=utf8_unicode_ci;
+insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));
+explain select distinct a from t1;
+select distinct a from t1;
+explain select a from t1 group by a;
+select a from t1 group by a;
+drop table t1;
+
 # End of 4.1 tests
 
 #