Clean up InnoDB testing with embedded server.

mysql-test/mysql-test-run.sh

@@ -1508,9 +1508,6 @@ run_testcase ()
    for t in \
 	"init_connect" \
 	"init_file" \
-        "innodb" \
-	"innodb-deadlock" \
-	"innodb-lock" \
 	"mix_innodb_myisam_binlog" \
 	"mysqlbinlog2" \
 	"mysqlbinlog" \

mysql-test/r/innodb-replace.result

+create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
+select * from t1;
+c1	c2	stamp
+replace delayed into t1 (c1, c2)  values ( "text1","11"),( "text2","12");
+ERROR HY000: Table storage engine for 't1' doesn't have this option
+select * from t1;
+c1	c2	stamp
+replace delayed into t1 (c1, c2)  values ( "text1","12"),( "text2","13"),( "text3","14", "a" ),( "text4","15", "b" );
+ERROR HY000: Table storage engine for 't1' doesn't have this option
+select * from t1;
+c1	c2	stamp
+drop table t1;

mysql-test/r/innodb.result

@@ -1401,18 +1401,6 @@ id	label
 3524	Societe Test
 3525	Fournisseur Test
 drop table t1,t2;
-create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
-select * from t1;
-c1	c2	stamp
-replace delayed into t1 (c1, c2)  values ( "text1","11"),( "text2","12");
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-select * from t1;
-c1	c2	stamp
-replace delayed into t1 (c1, c2)  values ( "text1","12"),( "text2","13"),( "text3","14", "a" ),( "text4","15", "b" );
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-select * from t1;
-c1	c2	stamp
-drop table t1;
 create table t1 (a int, b varchar(200), c text not null) checksum=1 engine=myisam;
 create table t2 (a int, b varchar(200), c text not null) checksum=0 engine=innodb;
 create table t3 (a int, b varchar(200), c text not null) checksum=1 engine=innodb;

mysql-test/t/innodb-deadlock.test

 -- source include/have_innodb.inc
+# Can't test this with embedded server
+-- source include/not_embedded.inc
 
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);

mysql-test/t/innodb-lock.test

 -- source include/have_innodb.inc
+# Can't test this with embedded server
+-- source include/not_embedded.inc
 
 #
 # Check and select innodb lock type

mysql-test/t/innodb-replace.test

+-- source include/have_innodb.inc
+# embedded server ignores 'delayed', so skip this
+-- source include/not_embedded.inc
+
+#
+# Bug #1078
+#
+create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
+select * from t1;
+--error 1031
+replace delayed into t1 (c1, c2)  values ( "text1","11"),( "text2","12");
+select * from t1;
+--error 1031
+replace delayed into t1 (c1, c2)  values ( "text1","12"),( "text2","13"),( "text3","14", "a" ),( "text4","15", "b" );
+select * from t1;
+drop table t1;
+

mysql-test/t/innodb.test

@@ -1021,19 +1021,6 @@ SELECT t2.id, t1.label FROM t2 INNER JOIN
 ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
 drop table t1,t2;
 
-#
-# Bug #1078
-#
-create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
-select * from t1;
---error 1031
-replace delayed into t1 (c1, c2)  values ( "text1","11"),( "text2","12");
-select * from t1;
---error 1031
-replace delayed into t1 (c1, c2)  values ( "text1","12"),( "text2","13"),( "text3","14", "a" ),( "text4","15", "b" );
-select * from t1;
-drop table t1;
-
 create table t1 (a int, b varchar(200), c text not null) checksum=1 engine=myisam;
 create table t2 (a int, b varchar(200), c text not null) checksum=0 engine=innodb;
 create table t3 (a int, b varchar(200), c text not null) checksum=1 engine=innodb;
@@ -1110,7 +1097,7 @@ show create table t2;
 drop table t2;
 
 # Test error handling
---replace_result \\ /
+--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
 --error 1005
 create table t2 (id int(11) not null, id2 int(11) not null, constraint t1_id_fk foreign key (id2,id) references t1 (id)) engine = innodb;