Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged

4 files changed, 16 insertions, 10 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 136b7272c1d..0780b97890f 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -262,7 +262,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0'
-) TYPE=HEAP
+) TYPE=HEAP CHARSET=latin1
 drop table t1;
 SET SESSION table_type="gemini";
 SELECT @@table_type;
@@ -273,6 +273,6 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0'
-) TYPE=MyISAM
+) TYPE=MyISAM CHARSET=latin1
 SET SESSION table_type=default;
 drop table t1;
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index df33af0709c..52b6fc307ae 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -140,13 +140,13 @@ id	parent_id	level
 1015	102	2
 explain select level from t1 where level=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	level	level	1	const	12	Using where; Using index
+1	SIMPLE	t1	ref	level	level	1	const	#	Using where; Using index
 explain select level,id from t1 where level=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	level	level	1	const	12	Using where; Using index
+1	SIMPLE	t1	ref	level	level	1	const	#	Using where; Using index
 explain select level,id,parent_id from t1 where level=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	level	level	1	const	12	Using where
+1	SIMPLE	t1	ref	level	level	1	const	#	Using where
 select level,id from t1 where level=1;
 level	id
 1	1002
@@ -168,9 +168,9 @@ Table	Op	Msg_type	Msg_text
 test.t1	optimize	error	The handler for the table doesn't support optimize
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	PRIMARY	1	id	A	87	NULL	NULL		BTREE	
-t1	1	parent_id	1	parent_id	A	43	NULL	NULL		BTREE	
-t1	1	level	1	level	A	6	NULL	NULL		BTREE	
+t1	0	PRIMARY	1	id	A	#	NULL	NULL		BTREE	
+t1	1	parent_id	1	parent_id	A	#	NULL	NULL		BTREE	
+t1	1	level	1	level	A	#	NULL	NULL		BTREE	
 drop table t1;
 CREATE TABLE t1 (
 gesuchnr int(11) DEFAULT '0' NOT NULL,
diff --git a/mysql-test/r/rpl_relayspace.result b/mysql-test/r/rpl_relayspace.result
index 5e552ef7400..610419980b5 100644
--- a/mysql-test/r/rpl_relayspace.result
+++ b/mysql-test/r/rpl_relayspace.result
@@ -1,9 +1,9 @@
-slave stop;
+stop slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-slave start;
+start slave;
 stop slave;
 create table t1 (a int);
 reset slave;
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index bfaeee78f8e..4d1a620d67f 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -22,6 +22,8 @@ drop table t1;
 
 #
 # A bit bigger test
+# The 'replace_result' statements are needed because the cardinality calculated
+# by innodb is not always the same between runs
 #
 
 CREATE TABLE t1 (
@@ -43,12 +45,16 @@ update ignore t1 set id=id+1; # This will change all rows
 select * from t1;
 update ignore t1 set id=1023 where id=1010;
 select * from t1 where parent_id=102;
+--replace_result 12 # 6 #
 explain select level from t1 where level=1;
+--replace_result 12 # 6 #
 explain select level,id from t1 where level=1;
+--replace_result 12 # 6 # 5 #
 explain select level,id,parent_id from t1 where level=1;
 select level,id from t1 where level=1;
 select level,id,parent_id from t1 where level=1;
 optimize table t1;
+--replace_result 87 # 50 # 48 # 43 # 25 # 24 # 6 # 3 #
 show keys from t1;
 drop table t1;