Clean up InnoDB testing with embedded server.

BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a:
  Delete: mysql-test/r/innodb.result.es
mysql-test/mysql-test-run.sh:
  Remove innodb tests from list of tests automatically skipped
  with embedded server
mysql-test/r/innodb.result:
  Update results
mysql-test/t/innodb-deadlock.test:
  Skip with embedded server
mysql-test/t/innodb-lock.test:
  Skip with embedded server
mysql-test/t/innodb.test:
  Move test of replace delayed to new test file, add to --replace_result
  to clean up path

1 files changed, 1 insertions, 14 deletions

diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index cf7be4f882c..770221f5238 100644
--- a/mysql-test/t/innodb.test
+++ b/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;