Merge rurik.mysql.com:/home/igor/mysql-4.1-opt

into  rurik.mysql.com:/home/igor/mysql-5.0-opt


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged

mysql-test/r/ctype_utf8.result

@@ -1161,6 +1161,7 @@ INSERT INTO t1 VALUES
 ('Käli Käli 2-4'), ('Käli Käli 2-4'),
 ('Käli Käli 2+4'), ('Käli Käli 2+4'),
 ('Käli Käli 2-6'), ('Käli Käli 2-6');
+INSERT INTO t1 SELECT * FROM t1;
 CREATE TABLE t2 (
 a CHAR(13) DEFAULT '',
 INDEX(a)
@@ -1169,26 +1170,31 @@ INSERT INTO t2 VALUES
 ('Kali Kali 2-4'), ('Kali Kali 2-4'),
 ('Kali Kali 2+4'), ('Kali Kali 2+4'),
 ('Kali Kali 2-6'), ('Kali Kali 2-6');
+INSERT INTO t2 SELECT * FROM t2;
 SELECT a FROM t1 WHERE a LIKE 'Käli Käli 2+4';
 a
 Käli Käli 2+4
 Käli Käli 2+4
+Käli Käli 2+4
+Käli Käli 2+4
 SELECT a FROM t2 WHERE a LIKE 'Kali Kali 2+4';
 a
 Kali Kali 2+4
 Kali Kali 2+4
+Kali Kali 2+4
+Kali Kali 2+4
 EXPLAIN SELECT a FROM t1 WHERE a LIKE 'Käli Käli 2+4';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	a	a	40	NULL	2	Using where; Using index
+1	SIMPLE	t1	range	a	a	40	NULL	4	Using where; Using index
 EXPLAIN SELECT a FROM t1 WHERE a = 'Käli Käli 2+4';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	a	a	40	const	2	Using where; Using index
+1	SIMPLE	t1	ref	a	a	40	const	4	Using where; Using index
 EXPLAIN SELECT a FROM t2 WHERE a LIKE 'Kali Kali 2+4';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	a	a	14	NULL	2	Using where; Using index
+1	SIMPLE	t2	range	a	a	14	NULL	4	Using where; Using index
 EXPLAIN SELECT a FROM t2 WHERE a = 'Kali Kali 2+4';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ref	a	a	14	const	2	Using where; Using index
+1	SIMPLE	t2	ref	a	a	14	const	4	Using where; Using index
 DROP TABLE t1,t2;
 CREATE TABLE t1 (
 a char(255) DEFAULT '', 

mysql-test/t/ctype_utf8.test

@@ -952,6 +952,7 @@ INSERT INTO t1 VALUES
  ('Käli Käli 2-4'), ('Käli Käli 2-4'),
  ('Käli Käli 2+4'), ('Käli Käli 2+4'),
  ('Käli Käli 2-6'), ('Käli Käli 2-6');
+INSERT INTO t1 SELECT * FROM t1;
 
 CREATE TABLE t2 (
   a CHAR(13) DEFAULT '',
@@ -962,6 +963,7 @@ INSERT INTO t2 VALUES
  ('Kali Kali 2-4'), ('Kali Kali 2-4'),
  ('Kali Kali 2+4'), ('Kali Kali 2+4'),
  ('Kali Kali 2-6'), ('Kali Kali 2-6');
+INSERT INTO t2 SELECT * FROM t2;
 
 SELECT a FROM t1 WHERE a LIKE 'Käli Käli 2+4';
 SELECT a FROM t2 WHERE a LIKE 'Kali Kali 2+4';