Enabled test rpl_ndb_insert_ignore

84992f54 · unknown · 9b5ce289 · 84992f54 · 84992f54
Commit 84992f54 authored Mar 24, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

mysql-test/r/rpl_ndb_insert_ignore.result mysql-test/r/rpl_ndb_insert_ignore.result +4 -4

mysql-test/t/disabled.def mysql-test/t/disabled.def +0 -1

No files found.
--- a/mysql-test/r/rpl_ndb_insert_ignore.result
+++ b/mysql-test/r/rpl_ndb_insert_ignore.result
@@ -30,16 +30,16 @@ a	b
 2	2
 3	3
 4	4
-5	5
+7	5
-6	6
+10	6
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	1
 2	2
 3	3
 4	4
-5	5
+7	5
-6	6
+10	6
 drop table t1;
 CREATE TABLE t1 (
 a int unsigned not null auto_increment primary key,

--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -32,7 +32,6 @@ rpl_ndb_auto_inc        : Bug#17086
 rpl_ndb_ddl             : master hangs
 #rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
 rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
-rpl_ndb_insert_ignore   : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296
 rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
 rpl_ndb_log             : result not deterministic, TBD if should remove
 rpl_ndb_relay_space     : Bug#16993