diff options
| author | serg@serg.mylan <> | 2005-04-05 13:17:49 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-04-05 13:17:49 +0200 |
| commit | 810b2c3d4059d0a03c1fcf48a9823db8a5dd5c6c (patch) | |
| tree | a9dd96a05ad4e0e84d0b4f7711b882492d5ea59d /mysql-test/t | |
| parent | 2b8ff6949f5f9abe83aa308e2e942ac4c6ed6f4b (diff) | |
| download | mariadb-git-810b2c3d4059d0a03c1fcf48a9823db8a5dd5c6c.tar.gz | |
remove the rest of isam/merge references
fix a race condition in TC_LOG_BINLOG::unlog
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/replace.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/xa.test | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/t/replace.test b/mysql-test/t/replace.test index 8429d80a4ef..2b3775f4f67 100644 --- a/mysql-test/t/replace.test +++ b/mysql-test/t/replace.test @@ -1,7 +1,5 @@ --- source include/have_isam.inc - # -# Test of REPLACE with ISAM and MyISAM and HEAP +# Test of REPLACE with MyISAM and HEAP # --disable_warnings @@ -12,13 +10,11 @@ CREATE TABLE t1 ( gesuchnr int(11) DEFAULT '0' NOT NULL, benutzer_id int(11) DEFAULT '0' NOT NULL, PRIMARY KEY (gesuchnr,benutzer_id) -) engine=ISAM; +); replace into t1 (gesuchnr,benutzer_id) values (2,1); replace into t1 (gesuchnr,benutzer_id) values (1,1); replace into t1 (gesuchnr,benutzer_id) values (1,1); -alter table t1 engine=myisam; -replace into t1 (gesuchnr,benutzer_id) values (1,1); alter table t1 engine=heap; replace into t1 (gesuchnr,benutzer_id) values (1,1); drop table t1; diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test index 1f2fb5056ed..321e5008035 100644 --- a/mysql-test/t/xa.test +++ b/mysql-test/t/xa.test @@ -31,6 +31,7 @@ xa end 'testa','testb'; connect (con1,localhost,,,); connection con1; +# gtrid [ , bqual [ , formatID ] ] xa start 0x7465737462, 0x2030405060, 0xb; insert t1 values (40); xa end 'testb',' 0@P`',11; |