results fixed after merge

mysql-test/t/create_select_tmp.test:
  --disable_warnings
mysql-test/t/rpl_drop.test:
  --disable_warnings

8 files changed, 37 insertions, 21 deletions

diff --git a/mysql-test/r/create_select_tmp.result b/mysql-test/r/create_select_tmp.result
index 610ee70b3e3..09ffc9013c7 100644
--- a/mysql-test/r/create_select_tmp.result
+++ b/mysql-test/r/create_select_tmp.result
@@ -2,18 +2,18 @@ drop table if exists t1, t2;
 CREATE TABLE t1 ( a int );
 INSERT INTO t1 VALUES (1),(2),(1);
 CREATE TABLE t2 ( PRIMARY KEY (a) ) TYPE=INNODB SELECT a FROM t1;
-Duplicate entry '1' for key 1
+ERROR 23000: Duplicate entry '1' for key 1
 select * from t2;
-Table 'test.t2' doesn't exist
+ERROR 42S02: Table 'test.t2' doesn't exist
 CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) TYPE=INNODB SELECT a FROM t1;
-Duplicate entry '1' for key 1
+ERROR 23000: Duplicate entry '1' for key 1
 select * from t2;
-Table 'test.t2' doesn't exist
+ERROR 42S02: Table 'test.t2' doesn't exist
 CREATE TABLE t2 ( PRIMARY KEY (a) ) TYPE=MYISAM SELECT a FROM t1;
-Duplicate entry '1' for key 1
+ERROR 23000: Duplicate entry '1' for key 1
 select * from t2;
-Table 'test.t2' doesn't exist
+ERROR 42S02: Table 'test.t2' doesn't exist
 CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) TYPE=MYISAM SELECT a FROM t1;
-Duplicate entry '1' for key 1
+ERROR 23000: Duplicate entry '1' for key 1
 select * from t2;
-Table 'test.t2' doesn't exist
+ERROR 42S02: Table 'test.t2' doesn't exist
diff --git a/mysql-test/r/endspace.result b/mysql-test/r/endspace.result
index d2519523f36..4800bbf4ecb 100644
--- a/mysql-test/r/endspace.result
+++ b/mysql-test/r/endspace.result
@@ -157,7 +157,7 @@ teststring
 teststring
 explain select * from t1 order by text1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	NULL	key1	32	NULL	4	Using index
+1	SIMPLE	t1	index	NULL	key1	32	NULL	3	Using index
 alter table t1 modify text1 char(32) binary not null;
 select * from t1 order by text1;
 text1
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 83d042cd279..9d830367745 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1345,6 +1345,18 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail
 update t3 set  t3.id=7  where t1.id =1 and t2.id = t1.id and t3.id = t2.id;
 ERROR 42S02: Unknown table 't1' in where clause
 drop table t3,t2,t1;
+create table t1(
+id int primary key,
+pid int,
+index(pid),
+foreign key(pid) references t1(id) on delete cascade) engine=innodb;
+insert into t1 values(0,0),(1,0),(2,1),(3,2),(4,3),(5,4),(6,5),(7,6),
+(8,7),(9,8),(10,9),(11,10),(12,11),(13,12),(14,13),(15,14);
+delete from t1 where id=0;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
+delete from t1 where id=15;
+delete from t1 where id=0;
+drop table t1;
 CREATE TABLE t1 (col1 int(1))ENGINE=InnoDB;
 CREATE TABLE t2 (col1 int(1),stamp TIMESTAMP,INDEX stamp_idx
 (stamp))ENGINE=InnoDB;
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index b9df6187a09..e0a2a364e45 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -302,18 +302,18 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye
 prepare stmt4 from ' show storage engines ';
 execute stmt4;
 Engine	Support	Comment
-MyISAM	YES/NO	Default type from 3.23 with great performance
-HEAP	YES/NO	Hash based, stored in memory, useful for temporary tables
-MEMORY	YES/NO	Alias for HEAP
+MyISAM	YES/NO	Default engine as of MySQL 3.23 with great performance
+HEAP	YES/NO	Alias for MEMORY
+MEMORY	YES/NO	Hash based, stored in memory, useful for temporary tables
 MERGE	YES/NO	Collection of identical MyISAM tables
 MRG_MYISAM	YES/NO	Alias for MERGE
-ISAM	YES/NO	Obsolete table type; Is replaced by MyISAM
-MRG_ISAM	YES/NO	Obsolete table type; Is replaced by MRG_MYISAM
-InnoDB	YES/NO	Supports transactions, row-level locking and foreign keys
+ISAM	YES/NO	Obsolete storage engine, now replaced by MyISAM
+MRG_ISAM	YES/NO	Obsolete storage engine, now replaced by MERGE
+InnoDB	YES/NO	Supports transactions, row-level locking, and foreign keys
 INNOBASE	YES/NO	Alias for INNODB
 BDB	YES/NO	Supports transactions and page-level locking
 BERKELEYDB	YES/NO	Alias for BDB
-NDBCLUSTER	YES/NO	Clustered, fault tolerant memory based tables
+NDBCLUSTER	YES/NO	Clustered, fault-tolerant, memory-based tables
 NDB	YES/NO	Alias for NDBCLUSTER
 EXAMPLE	YES/NO	Example storage engine
 ARCHIVE	YES/NO	Archive storage engine
diff --git a/mysql-test/r/rpl_drop.result b/mysql-test/r/rpl_drop.result
index ce1f5b6ee81..b83594c9bb1 100644
--- a/mysql-test/r/rpl_drop.result
+++ b/mysql-test/r/rpl_drop.result
@@ -1,10 +1,10 @@
-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;
 drop table if exists t1, t2;
 create table t1 (a int);
 drop table t1, t2;
-Unknown table 't2'
+ERROR 42S02: Unknown table 't2'
diff --git a/mysql-test/r/subselect2.result b/mysql-test/r/subselect2.result
index c2780a08d36..b04fec26c6f 100644
--- a/mysql-test/r/subselect2.result
+++ b/mysql-test/r/subselect2.result
@@ -120,9 +120,9 @@ DOCID	DOCNAME	DOCTYPEID	FOLDERID	AUTHOR	CREATED	TITLE	SUBTITLE	DOCABSTRACT	PUBLI
 c373e9f5ad07993f3859444553544200	Last Discussion	c373e9f5ad079174ff17444553544200	c373e9f5ad0796c0eca4444553544200	Goldilocks	2003-06-09 11:21:06	Title: Last Discussion	NULL	Setting new abstract and keeping doc checked out	2003-06-09 10:51:26	2003-06-09 10:51:26	NULL	NULL	NULL	03eea05112b845949f3fd03278b5fe43	2003-06-09 11:21:06	admin	0	NULL	Discussion	NULL	NULL
 EXPLAIN SELECT t2.*, t4.DOCTYPENAME, t1.CONTENTSIZE,t1.MIMETYPE FROM t2 INNER JOIN t4 ON t2.DOCTYPEID = t4.DOCTYPEID LEFT OUTER JOIN t1 ON t2.DOCID = t1.DOCID WHERE t2.FOLDERID IN(SELECT t3.FOLDERID FROM t3 WHERE t3.PARENTID IN(SELECT t3.FOLDERID FROM t3 WHERE t3.PARENTID IN(SELECT t3.FOLDERID FROM t3 WHERE t3.PARENTID IN(SELECT t3.FOLDERID FROM t3 WHERE t3.PARENTID IN(SELECT t3.FOLDERID FROM t3 WHERE t3.PARENTID='2f6161e879db43c1a5b82c21ddc49089' AND t3.FOLDERNAME = 'Level1') AND t3.FOLDERNAME = 'Level2') AND t3.FOLDERNAME = 'Level3') AND t3.FOLDERNAME = 'CopiedFolder') AND t3.FOLDERNAME = 'Movie Reviews') AND t2.DOCNAME = 'Last Discussion';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t2	ALL	DDOCTYPEID_IDX	NULL	NULL	NULL	10	Using where
+1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	0	const row not found
+1	PRIMARY	t2	ALL	DDOCTYPEID_IDX	NULL	NULL	NULL	9	Using where
 1	PRIMARY	t4	eq_ref	PRIMARY	PRIMARY	32	test.t2.DOCTYPEID	1	
-1	PRIMARY	t1	eq_ref	PRIMARY	PRIMARY	32	test.t2.DOCID	1	
 2	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
 3	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
 4	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
diff --git a/mysql-test/t/create_select_tmp.test b/mysql-test/t/create_select_tmp.test
index 36292abd899..166d32fb17c 100644
--- a/mysql-test/t/create_select_tmp.test
+++ b/mysql-test/t/create_select_tmp.test
@@ -6,7 +6,9 @@
 # inconsistency between binlog and the internal list of temp tables.
 
 -- source include/have_innodb.inc
+--disable_warnings
 drop table if exists t1, t2;
+--enable_warnings
 CREATE TABLE t1 ( a int );
 INSERT INTO t1 VALUES (1),(2),(1);
 --error 1062;
diff --git a/mysql-test/t/rpl_drop.test b/mysql-test/t/rpl_drop.test
index 6fc2500fc97..ab5b608cab6 100644
--- a/mysql-test/t/rpl_drop.test
+++ b/mysql-test/t/rpl_drop.test
@@ -1,7 +1,9 @@
 # Testcase for BUG#4552 (DROP on two tables, one of which does not
 # exist, must be binlogged with a non-zero error code)
 source include/master-slave.inc;
+--disable_warnings
 drop table if exists t1, t2;
+--enable_warnings
 create table t1 (a int);
 --error 1051;
 drop table t1, t2;