From 60a569bdca092ac957fccfbdb32dbfbf1a991485 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Jun 2006 14:34:42 +0300 Subject: [PATCH] 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 --- mysql-test/r/rpl_ndb_2myisam.result | 4 ++-- mysql-test/t/disabled.def | 2 +- mysql-test/t/rpl_ndb_2innodb-master.opt | 2 +- mysql-test/t/rpl_ndb_2innodb-slave.opt | 2 +- mysql-test/t/rpl_ndb_2myisam-master.opt | 2 +- mysql-test/t/rpl_ndb_2myisam-slave.opt | 2 +- mysql-test/t/rpl_ndb_innodb2ndb-master.opt | 2 +- mysql-test/t/rpl_ndb_innodb2ndb-slave.opt | 2 +- mysql-test/t/rpl_ndb_myisam2ndb-slave.opt | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/r/rpl_ndb_2myisam.result b/mysql-test/r/rpl_ndb_2myisam.result index 00fb2f5455f..8611d83f3f3 100644 --- a/mysql-test/r/rpl_ndb_2myisam.result +++ b/mysql-test/r/rpl_ndb_2myisam.result @@ -27,7 +27,7 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 --- Show table on slave --- SHOW CREATE TABLE t1; Table Create Table @@ -100,7 +100,7 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL, 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 --- --- and that the alter statements replicated correctly --- SHOW CREATE TABLE t1; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 77ca2e29669..4d84ed92efe 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -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 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_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_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 diff --git a/mysql-test/t/rpl_ndb_2innodb-master.opt b/mysql-test/t/rpl_ndb_2innodb-master.opt index f31d53c3cb1..701dddb075b 100644 --- a/mysql-test/t/rpl_ndb_2innodb-master.opt +++ b/mysql-test/t/rpl_ndb_2innodb-master.opt @@ -1 +1 @@ ---default-storage-engine=ndb --binlog-format=row +--default-storage-engine=ndbcluster diff --git a/mysql-test/t/rpl_ndb_2innodb-slave.opt b/mysql-test/t/rpl_ndb_2innodb-slave.opt index ee81186c513..d8857e54be2 100644 --- a/mysql-test/t/rpl_ndb_2innodb-slave.opt +++ b/mysql-test/t/rpl_ndb_2innodb-slave.opt @@ -1 +1 @@ ---innodb --default-storage-engine=innodb --binlog-format=row +--innodb --default-storage-engine=innodb diff --git a/mysql-test/t/rpl_ndb_2myisam-master.opt b/mysql-test/t/rpl_ndb_2myisam-master.opt index f31d53c3cb1..701dddb075b 100644 --- a/mysql-test/t/rpl_ndb_2myisam-master.opt +++ b/mysql-test/t/rpl_ndb_2myisam-master.opt @@ -1 +1 @@ ---default-storage-engine=ndb --binlog-format=row +--default-storage-engine=ndbcluster diff --git a/mysql-test/t/rpl_ndb_2myisam-slave.opt b/mysql-test/t/rpl_ndb_2myisam-slave.opt index 59de63c0da2..6035ce27c46 100644 --- a/mysql-test/t/rpl_ndb_2myisam-slave.opt +++ b/mysql-test/t/rpl_ndb_2myisam-slave.opt @@ -1 +1 @@ ---default-storage-engine=myisam --binlog-format=row +--default-storage-engine=myisam diff --git a/mysql-test/t/rpl_ndb_innodb2ndb-master.opt b/mysql-test/t/rpl_ndb_innodb2ndb-master.opt index 248f9e60566..627becdbfb5 100644 --- a/mysql-test/t/rpl_ndb_innodb2ndb-master.opt +++ b/mysql-test/t/rpl_ndb_innodb2ndb-master.opt @@ -1 +1 @@ ---innodb --binlog-format=row +--innodb diff --git a/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt b/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt index d6f11dcd7bc..7f9eb96dff1 100644 --- a/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt +++ b/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt @@ -1 +1 @@ ---binlog-format=row --default-storage-engine=ndbcluster +--default-storage-engine=ndbcluster diff --git a/mysql-test/t/rpl_ndb_myisam2ndb-slave.opt b/mysql-test/t/rpl_ndb_myisam2ndb-slave.opt index b7990823676..701dddb075b 100644 --- a/mysql-test/t/rpl_ndb_myisam2ndb-slave.opt +++ b/mysql-test/t/rpl_ndb_myisam2ndb-slave.opt @@ -1 +1 @@ ---default-storage-engine=ndbcluster --binlog-format=row +--default-storage-engine=ndbcluster