bk commit into 5.0 tree (igor:1.2193)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.2193 06/06/21 22:41:51 igor@stripped +2 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
  into  rurik.mysql.com:/home/igor/mysql-5.0-opt

  mysql-test/t/ctype_utf8.test
    1.83 06/06/21 22:41:44 igor@stripped +0 -0
    Auto merged

  mysql-test/r/ctype_utf8.result
    1.90 06/06/21 22:41:44 igor@stripped +0 -0
    Auto merged

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/mysql-5.0-opt/RESYNC

--- 1.89/mysql-test/r/ctype_utf8.result	2006-06-21 20:06:27 -07:00
+++ 1.90/mysql-test/r/ctype_utf8.result	2006-06-21 22:41:44 -07:00
@@ -1161,6 +1161,7 @@
 ('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 @@
 ('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 '', 

--- 1.82/mysql-test/t/ctype_utf8.test	2006-06-21 19:39:06 -07:00
+++ 1.83/mysql-test/t/ctype_utf8.test	2006-06-21 22:41:44 -07:00
@@ -952,6 +952,7 @@
  ('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 @@
  ('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';