bk commit into 5.0 tree (ramil:1.2255)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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-15 18:46:12+05:00, ramil@stripped +5 -0
  Merge mysql.com:/usr/home/ram/work/tmp_merge
  into  mysql.com:/usr/home/ram/work/mysql-5.0
  MERGE: 1.1616.2144.180

  BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3@stripped, 2006-08-15 18:39:38+05:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.1

  BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3@stripped, 2006-08-15 18:39:37+05:00, ramil@stripped +0 -0
    Merge rename: BitKeeper/deleted/.del-bug20328.result -> BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3

  BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5@stripped, 2006-08-15 18:39:38+05:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.1

  BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5@stripped, 2006-08-15 18:39:38+05:00, ramil@stripped +0 -0
    Merge rename: BitKeeper/deleted/.del-bug20328.test -> BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5

  myisam/mi_unique.c@stripped, 2006-08-15 18:39:41+05:00, ramil@stripped +0 -1
    MERGE: 1.20.1.2

  mysql-test/r/ctype_utf8.result@stripped, 2006-08-15 18:46:09+05:00, ramil@stripped +16 -16
    merge
    MERGE: 1.45.5.5

  mysql-test/t/ctype_utf8.test@stripped, 2006-08-15 18:38:41+05:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.57.5.5

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0/RESYNC

--- 1.92/mysql-test/r/ctype_utf8.result	2006-08-15 18:46:19 +05:00
+++ 1.93/mysql-test/r/ctype_utf8.result	2006-08-15 18:46:19 +05:00
@@ -1390,3 +1390,19 @@
 execute my_stmt using @a;
 a	b
 drop table if exists 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;

--- 1.85/mysql-test/t/ctype_utf8.test	2006-08-15 18:46:19 +05:00
+++ 1.86/mysql-test/t/ctype_utf8.test	2006-08-15 18:46:19 +05:00
@@ -1026,6 +1026,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
 
 #