1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-apply missing changeset, orignally pushed by jmiller

Browse Source 
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
This commit is contained in:
unknown 2006-06-06 14:34:42 +03:00
parent a68a9cb693
commit 60a569bdca
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/rpl_ndb_2myisam.result
View File

@ -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;

2
mysql-test/t/disabled.def
View File

@ -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

2
mysql-test/t/rpl_ndb_2innodb-master.opt
View File

@ -1 +1 @@
--default-storage-engine=ndb --binlog-format=row
--default-storage-engine=ndbcluster

2
mysql-test/t/rpl_ndb_2innodb-slave.opt
View File

@ -1 +1 @@
--innodb --default-storage-engine=innodb --binlog-format=row
--innodb --default-storage-engine=innodb

2
mysql-test/t/rpl_ndb_2myisam-master.opt
View File

@ -1 +1 @@
--default-storage-engine=ndb --binlog-format=row
--default-storage-engine=ndbcluster

2
mysql-test/t/rpl_ndb_2myisam-slave.opt
View File

@ -1 +1 @@
--default-storage-engine=myisam --binlog-format=row
--default-storage-engine=myisam

2
mysql-test/t/rpl_ndb_innodb2ndb-master.opt
View File

@ -1 +1 @@
--innodb --binlog-format=row
--innodb

2
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt
View File

@ -1 +1 @@
--binlog-format=row --default-storage-engine=ndbcluster
--default-storage-engine=ndbcluster

2
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt
View File

@ -1 +1 @@
--default-storage-engine=ndbcluster --binlog-format=row
--default-storage-engine=ndbcluster