Commit baf121de authored by unknown's avatar unknown
Browse files

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
parent ff9a1bd2

mysql-test/mysql-test-run.sh

+0 −3
Original line number Diff line number Diff line
@@ -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

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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

+0 −12
Original line number Diff line number Diff line
@@ -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/r/innodb.result.es

deleted100644 → 0
+0 −1653

File deleted.

Preview size limit exceeded, changes collapsed.

mysql-test/t/innodb-deadlock.test

+2 −0
Original line number Diff line number Diff line 
-- 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,,);