bk commit into 5.1 tree (jmiller:1.2178)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2178 06/05/31 23:08:31 jmiller@stripped +9 -0
  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/05/31 23:04:38 jmiller@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  BitKeeper/deleted/.del-rpl_ndb_myisam2ndb-master.opt~92b70b6bba6d9ff
    1.2 06/05/31 22:46:27 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_ndb_myisam2ndb-master.opt

  mysql-test/t/rpl_ndb_innodb2ndb-slave.opt
    1.3 06/05/31 22:45:33 jmiller@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_innodb2ndb-master.opt
    1.2 06/05/31 22:45:33 jmiller@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/r/rpl_ndb_2myisam.result
    1.3 06/05/31 20:15:47 jmiller@stripped +2 -2
    Update results. Test now passing. Have commented it out in disable.def file

  mysql-test/t/rpl_ndb_2myisam-slave.opt
    1.2 06/05/31 20:00:09 jmiller@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2myisam-master.opt
    1.2 06/05/31 20:00:09 jmiller@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2innodb-master.opt
    1.2 06/05/31 18:43:26 jmiller@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2innodb-slave.opt
    1.2 06/05/31 18:43:21 jmiller@stripped +1 -1
    Removed the --binlog-format=row and they are not needed

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/space/mysql-5.1-new

--- 1.1/mysql-test/t/rpl_ndb_2innodb-master.opt	2006-02-27 14:53:35 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_2innodb-master.opt	2006-05-31 18:43:26 +02: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 14:53:28 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_2innodb-slave.opt	2006-05-31 18:43:21 +02: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 14:54:22 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_2myisam-master.opt	2006-05-31 20:00:09 +02: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 14:54:29 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_2myisam-slave.opt	2006-05-31 20:00:09 +02: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 14:56:19 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_innodb2ndb-master.opt	2006-05-31 22:45:33 +02:00
@@ -1 +1 @@
---innodb --binlog-format=row 
+--innodb

--- 1.2/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt	2006-05-11 11:09:47 +02:00
+++ 1.3/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt	2006-05-31 22:45:33 +02: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 11:09:47 +02:00
+++ 1.3/mysql-test/t/rpl_ndb_myisam2ndb-slave.opt	2006-05-31 23:04:38 +02:00
@@ -1 +1 @@
---default-storage-engine=ndbcluster --binlog-format=row
+--default-storage-engine=ndbcluster 

--- 1.2/mysql-test/r/rpl_ndb_2myisam.result	2006-05-20 12:34:57 +02:00
+++ 1.3/mysql-test/r/rpl_ndb_2myisam.result	2006-05-31 20:15:47 +02: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;