Commit 60a569bd authored by unknown's avatar unknown

Re-apply missing changeset, orignally pushed by jmiller

RPL Test cleanup of options that are not needed when using ndbcluster with binlog. The binlog is forced to row just by connecting to a cluster


mysql-test/r/rpl_ndb_2myisam.result:
  Update results. Test now passing. Have commented it out in disable.def file
mysql-test/t/disabled.def:
  updated to comment out test that is working
mysql-test/t/rpl_ndb_2innodb-master.opt:
  Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_2innodb-slave.opt:
  Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_2myisam-master.opt:
  Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_2myisam-slave.opt:
  Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_innodb2ndb-master.opt:
  Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
  Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
  Removed the --binlog-format=row and they are not needed
parent a68a9cb6
...@@ -27,7 +27,7 @@ t1 CREATE TABLE `t1` ( ...@@ -27,7 +27,7 @@ t1 CREATE TABLE `t1` (
`y` year(4) DEFAULT NULL, `y` year(4) DEFAULT NULL,
`t` date DEFAULT NULL, `t` date DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) ENGINE=ndbcluster DEFAULT CHARSET=latin1
--- Show table on slave --- --- Show table on slave ---
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
...@@ -100,7 +100,7 @@ t1 CREATE TABLE `t1` ( ...@@ -100,7 +100,7 @@ t1 CREATE TABLE `t1` (
`y` year(4) DEFAULT NULL, `y` year(4) DEFAULT NULL,
`t` date DEFAULT NULL, `t` date DEFAULT NULL,
PRIMARY KEY (`id`,`total`) PRIMARY KEY (`id`,`total`)
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) ENGINE=ndbcluster DEFAULT CHARSET=latin1
--- Make sure that our tables on slave are still same engine --- --- Make sure that our tables on slave are still same engine ---
--- and that the alter statements replicated correctly --- --- and that the alter statements replicated correctly ---
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
......
...@@ -22,7 +22,7 @@ ndb_load : BUG#17233 2006-05-04 tomas failed load data from infi ...@@ -22,7 +22,7 @@ ndb_load : BUG#17233 2006-05-04 tomas failed load data from infi
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
rpl_ndb_2myisam : BUG#19227 2006-04-20 pekka pk delete apparently not replicated rpl_ndb_2myisam : BUG#19227 Seems to pass currently
rpl_ndb_auto_inc : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and auto_increment_offset produce duplicate key er rpl_ndb_auto_inc : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and auto_increment_offset produce duplicate key er
#rpl_ndb_commit_afterflush : BUG#19328 2006-05-04 tomas Slave timeout with COM_REGISTER_SLAVE error causing stop #rpl_ndb_commit_afterflush : BUG#19328 2006-05-04 tomas Slave timeout with COM_REGISTER_SLAVE error causing stop
rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
......
--default-storage-engine=ndb --binlog-format=row --default-storage-engine=ndbcluster
--innodb --default-storage-engine=innodb --binlog-format=row --innodb --default-storage-engine=innodb
--default-storage-engine=ndb --binlog-format=row --default-storage-engine=ndbcluster
--default-storage-engine=myisam --binlog-format=row --default-storage-engine=myisam
--binlog-format=row --default-storage-engine=ndbcluster --default-storage-engine=ndbcluster
--default-storage-engine=ndbcluster --binlog-format=row --default-storage-engine=ndbcluster
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment