Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

7 files changed, 15 insertions, 13 deletions

diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result
index 020d6c6534f..919478c7265 100644
--- a/mysql-test/r/distinct.result
+++ b/mysql-test/r/distinct.result
@@ -173,9 +173,9 @@ INSERT INTO t2 values (1),(2),(3);
 INSERT INTO t3 VALUES (1,'1'),(2,'2'),(1,'1'),(2,'2');
 explain SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a;
 table	type	possible_keys	key	key_len	ref	rows	Extra
-t3	index	a	a	5	NULL	6	Using index; Using temporary
-t2	index	a	a	4	NULL	5	Using index; Distinct
-t1	eq_ref	PRIMARY	PRIMARY	4	t2.a	1	Using where; Distinct
+t1	ALL	PRIMARY	NULL	NULL	NULL	2	Using temporary
+t2	ref	a	a	4	t1.a	1	Using index
+t3	ref	a	a	5	t1.b	1	Using where; Using index
 SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a;
 a
 1
@@ -190,7 +190,7 @@ insert into t3 select * from t4;
 explain select distinct t1.a from t1,t3 where t1.a=t3.a;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	index	PRIMARY	PRIMARY	4	NULL	2	Using index; Using temporary
-t3	ref	a	a	5	t1.a	10	Using where; Using index; Distinct
+t3	ref	a	a	5	t1.a	1	Using where; Using index; Distinct
 select distinct t1.a from t1,t3 where t1.a=t3.a;
 a
 1
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index edf109fcc93..fc1e0788087 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -135,8 +135,8 @@ id
 3
 show keys from t2;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t2	1	tig	1	ticket	A	NULL	NULL	NULL	YES	BTREE	
-t2	1	tix	1	inhalt	A	NULL	1	NULL	YES	FULLTEXT	
+t2	1	tig	1	ticket	A	3	NULL	NULL	YES	BTREE	
+t2	1	tix	1	inhalt	A	1	1	NULL	YES	FULLTEXT	
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
diff --git a/mysql-test/r/key_diff.result b/mysql-test/r/key_diff.result
index 4eaccc696f9..f8671639e2c 100644
--- a/mysql-test/r/key_diff.result
+++ b/mysql-test/r/key_diff.result
@@ -36,7 +36,7 @@ a	a	a	a
 explain select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ALL	a	NULL	NULL	NULL	5	
-t2	ALL	b	NULL	NULL	NULL	5	Using where
+t2	ref	b	b	4	t1.a	1	Using where
 select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B order by binary t1.a,t2.a;
 a	b	a	b
 A	B	a	a
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
index 48773bfa916..62a42150eb3 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -450,9 +450,9 @@ gid	sid	uid
 103853	5	250
 EXPLAIN select t1.gid, t2.sid, t3.uid from t3, t2, t1 where t2.gid = t1.gid and t2.uid = t3.uid order by t1.gid, t3.uid;
 table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index
-t2	eq_ref	PRIMARY,uid	PRIMARY	4	t1.gid	1	
-t3	eq_ref	PRIMARY	PRIMARY	2	t2.uid	1	Using where; Using index
+t3	index	PRIMARY	PRIMARY	2	NULL	6	Using index; Using temporary; Using filesort
+t2	ref	PRIMARY,uid	uid	2	t3.uid	1	Using where
+t1	eq_ref	PRIMARY	PRIMARY	4	t2.gid	1	Using index
 EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.gid = t3.uid order by t1.gid,t3.skr;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	index	PRIMARY	PRIMARY	4	NULL	6	Using index
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index a921d75f20a..51cd67ac832 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3239,8 +3239,8 @@ Field	Type	Null	Key	Default	Extra	Privileges
 show keys from t2;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t2	0	PRIMARY	1	auto	A	1199	NULL	NULL		BTREE	
-t2	0	fld1	1	fld1	A	1199	NULL	NULL		BTREE	
-t2	1	fld3	1	fld3	A	NULL	NULL	NULL		BTREE	
+t2	0	fld1	1	fld1	A	0	NULL	NULL		BTREE	
+t2	1	fld3	1	fld3	A	1199	NULL	NULL		BTREE	
 drop table t4, t3, t2, t1;
 DO 1;
 DO benchmark(100,1+1),1,1;
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 2c32d766a38..70548311e26 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -9,7 +9,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	Table is already up to date
 check table t1 changed;
 Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
+test.t1	check	status	Table is already up to date
 insert into t1 values (5,5,5);
 check table t1 changed;
 Table	Op	Msg_type	Msg_text
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index 0bca8dc5890..9b06b522028 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -46,6 +46,8 @@ drop table t1;
 create table t1 (sid char(20), id int(2) NOT NULL auto_increment, key(sid, id));
 insert into t1 values ('skr',NULL),('skr',NULL),('test',NULL);
 select * from t1;
+insert into t1 values ('rts',NULL),('rts',NULL),('test',NULL);
+select * from t1;
 drop table t1;
 
 #