bk commit into 5.1 tree (tulin:1.1941)

[tomas]

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.1941 05/06/07 15:49:51 tulin@stripped +2 -0
  rpl_ndb_basic.test, rpl_ndb_basic.result:
    new file

  mysql-test/t/rpl_ndb_basic.test
    1.1 05/06/07 15:49:18 ndbdev@stripped +38 -0

  mysql-test/r/rpl_ndb_basic.result
    1.1 05/06/07 15:49:18 ndbdev@stripped +27 -0

  mysql-test/t/rpl_ndb_basic.test
    1.0 05/06/07 15:49:18 ndbdev@stripped +0 -0
    BitKeeper file /home/ndbdev/tomas/mysql-5.1-wl2325/mysql-test/t/rpl_ndb_basic.test

  mysql-test/r/rpl_ndb_basic.result
    1.0 05/06/07 15:49:18 ndbdev@stripped +0 -0
    BitKeeper file /home/ndbdev/tomas/mysql-5.1-wl2325/mysql-test/r/rpl_ndb_basic.result

# 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:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1-wl2325
--- New file ---
+++ mysql-test/r/rpl_ndb_basic.result	05/06/07 15:49:18
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0',
`nom` char(4) default NULL,
`prenom` char(4) default NULL,
PRIMARY KEY  (`nid`)) 
ENGINE=ndbcluster DEFAULT CHARSET=latin1;
INSERT INTO t1 VALUES(1,"XYZ1","ABC1");
select * from t1 order by nid;
nid	nom	prenom
1	XYZ1	ABC1
select * from t1 order by nid;
nid	nom	prenom
1	XYZ1	ABC1
delete from t1;
INSERT INTO t1 VALUES(1,"XYZ2","ABC2");
select * from t1 order by nid;
nid	nom	prenom
1	XYZ2	ABC2
select * from t1 order by nid;
nid	nom	prenom
1	XYZ2	ABC2
DROP table t1;

--- New file ---
+++ mysql-test/t/rpl_ndb_basic.test	05/06/07 15:49:18
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
--source include/master-slave.inc



#
# Bug #11087
#
# connect to the master and create tabe t1 in gotoslave database
--connection master
CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0',
 	            `nom` char(4) default NULL,
  		    `prenom` char(4) default NULL,
		    PRIMARY KEY  (`nid`)) 
    ENGINE=ndbcluster DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES(1,"XYZ1","ABC1");
select * from t1 order by nid;

--sync_slave_with_master
# connect to slave and ensure data it there.
--connection slave
select * from t1 order by nid;

--connection master
delete from t1;
INSERT INTO t1 VALUES(1,"XYZ2","ABC2");
# Make sure all rows are on the master
select * from t1 order by nid;

# make sure all rows are on the slave.
--sync_slave_with_master
--connection slave
# Bug #11087 would have row with nid 2 missing
select * from t1 order by nid;

DROP table t1;