summaryrefslogtreecommitdiff
path: root/mysql-test/r/replace.result
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-04-05 13:17:49 +0200
committerunknown <serg@serg.mylan>2005-04-05 13:17:49 +0200
commitcd0a50bf34477bf547cc4a66f0d5d9651574a65b (patch)
treea9dd96a05ad4e0e84d0b4f7711b882492d5ea59d /mysql-test/r/replace.result
parent5dbcb1555fb63618be171b478a1af8a49b3b46ef (diff)
downloadmariadb-git-cd0a50bf34477bf547cc4a66f0d5d9651574a65b.tar.gz
remove the rest of isam/merge references
fix a race condition in TC_LOG_BINLOG::unlog include/Makefile.am: remove the rest of isam/merge references include/config-win.h: unused and abused macro removed include/my_pthread.h: unused and abused macro removed include/my_sys.h: MY_IGNORE_BADFD flag include/mysql_embed.h: remove the rest of isam/merge references mysql-test/r/replace.result: remove the rest of isam/merge references mysql-test/t/replace.test: remove the rest of isam/merge references mysql-test/t/xa.test: comment mysys/my_sync.c: MY_IGNORE_BADFD flag sql/handler.cc: remove the rest of isam/merge references sql/log.cc: fix a race condition in TC_LOG_BINLOG::unlog preparation for binlog group commit sql/mysql_priv.h: remove duplicates sql/mysqld.cc: remove the rest of isam/merge references sql/opt_range.cc: remove the rest of isam/merge references sql/set_var.cc: hide unused variables. simplify sync_binlog code sql/sql_base.cc: remove the rest of isam/merge references sql/sql_class.h: cleanup
Diffstat (limited to 'mysql-test/r/replace.result')
-rw-r--r--mysql-test/r/replace.result4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/r/replace.result b/mysql-test/r/replace.result
index 83cde76215a..a7d59fcfa62 100644
--- a/mysql-test/r/replace.result
+++ b/mysql-test/r/replace.result
@@ -3,12 +3,10 @@ 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;