bk commit into 5.1 tree (msvensson:1.2187)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2187 06/06/06 14:34:42 msvensson@stripped +9 -0
  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/t/rpl_ndb_myisam2ndb-slave.opt
    1.3 06/06/06 14:34:39 msvensson@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_innodb2ndb-slave.opt
    1.3 06/06/06 14:34:39 msvensson@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_innodb2ndb-master.opt
    1.2 06/06/06 14:34:39 msvensson@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2myisam-slave.opt
    1.2 06/06/06 14:34:39 msvensson@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2myisam-master.opt
    1.2 06/06/06 14:34:39 msvensson@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2innodb-slave.opt
    1.2 06/06/06 14:34:39 msvensson@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2innodb-master.opt
    1.2 06/06/06 14:34:39 msvensson@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/disabled.def
    1.163 06/06/06 14:34:39 msvensson@stripped +1 -1
    updated to comment out test that is working

  mysql-test/r/rpl_ndb_2myisam.result
    1.3 06/06/06 14:34:39 msvensson@stripped +2 -2
    Update results. Test now passing. Have commented it out in disable.def file

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1-ok

--- 1.1/mysql-test/t/rpl_ndb_2innodb-master.opt	2006-02-27 15:53:35 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_2innodb-master.opt	2006-06-06 14:34:39 +03:00
@@ -1 +1 @@
---default-storage-engine=ndb --binlog-format=row
+--default-storage-engine=ndbcluster 

--- 1.1/mysql-test/t/rpl_ndb_2innodb-slave.opt	2006-02-27 15:53:28 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_2innodb-slave.opt	2006-06-06 14:34:39 +03:00
@@ -1 +1 @@
---innodb --default-storage-engine=innodb --binlog-format=row
+--innodb --default-storage-engine=innodb 

--- 1.1/mysql-test/t/rpl_ndb_2myisam-master.opt	2006-02-27 15:54:22 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_2myisam-master.opt	2006-06-06 14:34:39 +03:00
@@ -1 +1 @@
---default-storage-engine=ndb --binlog-format=row
+--default-storage-engine=ndbcluster 

--- 1.1/mysql-test/t/rpl_ndb_2myisam-slave.opt	2006-02-27 15:54:29 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_2myisam-slave.opt	2006-06-06 14:34:39 +03:00
@@ -1 +1 @@
---default-storage-engine=myisam --binlog-format=row
+--default-storage-engine=myisam 

--- 1.1/mysql-test/t/rpl_ndb_innodb2ndb-master.opt	2006-02-27 15:56:19 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_innodb2ndb-master.opt	2006-06-06 14:34:39 +03:00
@@ -1 +1 @@
---innodb --binlog-format=row 
+--innodb

--- 1.2/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt	2006-05-11 12:09:47 +03:00
+++ 1.3/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt	2006-06-06 14:34:39 +03:00
@@ -1 +1 @@
---binlog-format=row --default-storage-engine=ndbcluster
+--default-storage-engine=ndbcluster

--- 1.2/mysql-test/t/rpl_ndb_myisam2ndb-slave.opt	2006-05-11 12:09:47 +03:00
+++ 1.3/mysql-test/t/rpl_ndb_myisam2ndb-slave.opt	2006-06-06 14:34:39 +03:00
@@ -1 +1 @@
---default-storage-engine=ndbcluster --binlog-format=row
+--default-storage-engine=ndbcluster 

--- 1.162/mysql-test/t/disabled.def	2006-06-01 13:59:31 +03:00
+++ 1.163/mysql-test/t/disabled.def	2006-06-06 14:34:39 +03:00
@@ -22,7 +22,7 @@
 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

--- 1.2/mysql-test/r/rpl_ndb_2myisam.result	2006-05-20 13:34:57 +03:00
+++ 1.3/mysql-test/r/rpl_ndb_2myisam.result	2006-06-06 14:34:39 +03:00
@@ -27,7 +27,7 @@
   `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 @@
   `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;