summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfranio Correia <alfranio.correia@oracle.com>2011-01-31 14:31:33 +0000
committerAlfranio Correia <alfranio.correia@oracle.com>2011-01-31 14:31:33 +0000
commit2d2f80e07e858f157a0823c5e886c3589cd1a435 (patch)
tree59d18191317d284e084576ec0ed1d77839b68859
parent54c58cea3bdc0733ffe7ba1dd93632ac6b78e403 (diff)
downloadmariadb-git-2d2f80e07e858f157a0823c5e886c3589cd1a435.tar.gz
Post-fix for BUG#59338.
-rw-r--r--mysql-test/suite/rpl/r/rpl_insert_ignore.result4
-rw-r--r--mysql-test/suite/rpl/t/rpl_insert_ignore.test2
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_insert_ignore.result b/mysql-test/suite/rpl/r/rpl_insert_ignore.result
index 5d9c4aec9f7..63b9244a40d 100644
--- a/mysql-test/suite/rpl/r/rpl_insert_ignore.result
+++ b/mysql-test/suite/rpl/r/rpl_insert_ignore.result
@@ -30,11 +30,11 @@ CREATE TABLE t1 (
a int unsigned not null auto_increment primary key,
b int unsigned,
unique (b)
-) ENGINE=innodb;
+) ENGINE=myisam;
CREATE TABLE t2 (
a int unsigned, # to force INSERT SELECT to have a certain order
b int unsigned
-) ENGINE=innodb;
+) ENGINE=myisam;
INSERT INTO t1 VALUES (NULL, 1);
INSERT INTO t1 VALUES (NULL, 2);
INSERT INTO t1 VALUES (NULL, 3);
diff --git a/mysql-test/suite/rpl/t/rpl_insert_ignore.test b/mysql-test/suite/rpl/t/rpl_insert_ignore.test
index 265a52fb51d..4129d4d553e 100644
--- a/mysql-test/suite/rpl/t/rpl_insert_ignore.test
+++ b/mysql-test/suite/rpl/t/rpl_insert_ignore.test
@@ -8,7 +8,7 @@
-- let $engine_type=innodb
-- source extra/rpl_tests/rpl_insert_ignore.test
--- let $engine_type=innodb
+-- let $engine_type=myisam
-- source extra/rpl_tests/rpl_insert_ignore.test
--source include/rpl_end.inc