#At file:///home/acorreia/workspace.oracle/repository.mysql/bzrwork/bug-59338/mysql-5.1-merge/ based on revid:alfranio.correia@stripped
3570 Alfranio Correia 2011-01-31
Post-fix for BUG#59338.
modified:
mysql-test/suite/rpl/r/rpl_insert_ignore.result
mysql-test/suite/rpl/t/rpl_insert_ignore.test
=== modified file 'mysql-test/suite/rpl/r/rpl_insert_ignore.result'
--- a/mysql-test/suite/rpl/r/rpl_insert_ignore.result 2011-01-28 12:09:15 +0000
+++ b/mysql-test/suite/rpl/r/rpl_insert_ignore.result 2011-01-31 14:31:33 +0000
@@ -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);
=== modified file 'mysql-test/suite/rpl/t/rpl_insert_ignore.test'
--- a/mysql-test/suite/rpl/t/rpl_insert_ignore.test 2011-01-28 12:09:15 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert_ignore.test 2011-01-31 14:31:33 +0000
@@ -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
Attachment: [text/bzr-bundle] bzr/alfranio.correia@oracle.com-20110131143133-tbrk92p7b691sy7v.bundle
Thread |
---|
• bzr commit into mysql-5.1 branch (alfranio.correia:3570) Bug#59338 | Alfranio Correia | 31 Jan |