Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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/in...urce-tree.html

ChangeSet
1.1943 05/06/07 12:03:15 tomas (AT) poseidon (DOT) ndb.mysql.com +2 -0
rpl_ndb_basic.test, rpl_ndb_basic.result:
simplified test

mysql-test/t/rpl_ndb_basic.test
1.4 05/06/07 12:02:46 tomas (AT) poseidon (DOT) ndb.mysql.com +18 -57
simplified test

mysql-test/r/rpl_ndb_basic.result
1.2 05/06/07 12:02:46 tomas (AT) poseidon (DOT) ndb.mysql.com +9 -81
simplified test

# 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: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/wl2325-wl1354-new

--- 1.1/mysql-test/r/rpl_ndb_basic.result 2005-06-06 23:48:02 +02:00
+++ 1.2/mysql-test/r/rpl_ndb_basic.result 2005-06-07 12:02:46 +02:00
@@ -4,98 +4,26 @@
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
-DROP DATABASE IF EXISTS gotoslave;
-CREATE DATABASE gotoslave;
-USE gotoslave;
-CREATE TABLE `matable` ( `nid` int(11) NOT NULL default '0',
+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 matable VALUES(1,"XYZ1","ABC1");
-INSERT INTO matable VALUES(2,"XYZ2","ABC2");
-INSERT INTO matable VALUES(3,"XYZ3","ABC3");
-INSERT INTO matable VALUES(4,"XYZ4","ABC4");
-INSERT INTO matable VALUES(5,"XYZ5","ABC5");
-INSERT INTO matable VALUES(6,"XYZ6","ABC6");
-INSERT INTO matable VALUES(7,"XYZ7","ABC7");
-INSERT INTO matable VALUES(8,"XYZ8","ABC8");
-INSERT INTO matable VALUES(9,"XYZ9","ABC9");
-select * from matable order by nid;
+INSERT INTO t1 VALUES(1,"XYZ1","ABC1");
+select * from t1 order by nid;
nid nom prenom
1 XYZ1 ABC1
-2 XYZ2 ABC2
-3 XYZ3 ABC3
-4 XYZ4 ABC4
-5 XYZ5 ABC5
-6 XYZ6 ABC6
-7 XYZ7 ABC7
-8 XYZ8 ABC8
-9 XYZ9 ABC9
-USE gotoslave;
-select * from matable order by nid;
-nid nom prenom
-1 XYZ1 ABC1
-2 XYZ2 ABC2
-3 XYZ3 ABC3
-4 XYZ4 ABC4
-5 XYZ5 ABC5
-6 XYZ6 ABC6
-7 XYZ7 ABC7
-8 XYZ8 ABC8
-9 XYZ9 ABC9
-delete from matable where nid=3;
-select * from matable order by nid;
+select * from t1 order by nid;
nid nom prenom
1 XYZ1 ABC1
-2 XYZ2 ABC2
-4 XYZ4 ABC4
-5 XYZ5 ABC5
-6 XYZ6 ABC6
-7 XYZ7 ABC7
-8 XYZ8 ABC8
-9 XYZ9 ABC9
-select * from matable order by nid;
-nid nom prenom
-1 XYZ1 ABC1
-2 XYZ2 ABC2
-4 XYZ4 ABC4
-5 XYZ5 ABC5
-6 XYZ6 ABC6
-7 XYZ7 ABC7
-8 XYZ8 ABC8
-9 XYZ9 ABC9
-delete from matable;
-INSERT INTO matable VALUES(1,"XYZ1","ABC1");
-INSERT INTO matable VALUES(2,"XYZ2","ABC2");
-INSERT INTO matable VALUES(3,"XYZ3","ABC3");
-INSERT INTO matable VALUES(4,"XYZ4","ABC4");
-INSERT INTO matable VALUES(5,"XYZ5","ABC5");
-INSERT INTO matable VALUES(6,"XYZ6","ABC6");
-INSERT INTO matable VALUES(7,"XYZ7","ABC7");
-INSERT INTO matable VALUES(8,"XYZ8","ABC8");
-INSERT INTO matable VALUES(9,"XYZ9","ABC9");
-select * from matable order by nid;
+delete from t1;
+INSERT INTO t1 VALUES(1,"XYZ1","ABC1"),(2,"XYZ2","ABC2");
+select * from t1 order by nid;
nid nom prenom
1 XYZ1 ABC1
2 XYZ2 ABC2
-3 XYZ3 ABC3
-4 XYZ4 ABC4
-5 XYZ5 ABC5
-6 XYZ6 ABC6
-7 XYZ7 ABC7
-8 XYZ8 ABC8
-9 XYZ9 ABC9
-select * from matable order by nid;
+select * from t1 order by nid;
nid nom prenom
1 XYZ1 ABC1
2 XYZ2 ABC2
-3 XYZ3 ABC3
-4 XYZ4 ABC4
-4 XYZ4 ABC4
-5 XYZ5 ABC5
-6 XYZ6 ABC6
-7 XYZ7 ABC7
-8 XYZ8 ABC8
-9 XYZ9 ABC9
-DROP DATABASE gotoslave;
+DROP table t1;

--- 1.3/mysql-test/t/rpl_ndb_basic.test 2005-06-07 00:35:19 +02:00
+++ 1.4/mysql-test/t/rpl_ndb_basic.test 2005-06-07 12:02:46 +02:00
@@ -1,78 +1,39 @@
-#
-# Currently this test only runs in the source tree with the
-# ndb/test programs compiled.
-# invoke with: ./mysql-test-run --do-test=rpl_ndb_alcatel
-#
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
--source include/master-slave.inc
---disable_warnings



-# drop the database on the master and recreate.
---connection master
-DROP DATABASE IF EXISTS gotoslave;
-CREATE DATABASE gotoslave;
---enable_warnings
-
-# connect to the master and create tabe matable in gotoslave database
+#
+# Bug #11087
+#
+# connect to the master and create tabe t1 in gotoslave database
--connection master
-USE gotoslave;
-CREATE TABLE `matable` ( `nid` int(11) NOT NULL default '0',
- `nom` char(4) default NULL,
- `prenom` char(4) default NULL,
- PRIMARY KEY (`nid`))
+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;

#source ./file2; This was the data from file2
-INSERT INTO matable VALUES(1,"XYZ1","ABC1");
-INSERT INTO matable VALUES(2,"XYZ2","ABC2");
-INSERT INTO matable VALUES(3,"XYZ3","ABC3");
-INSERT INTO matable VALUES(4,"XYZ4","ABC4");
-INSERT INTO matable VALUES(5,"XYZ5","ABC5");
-INSERT INTO matable VALUES(6,"XYZ6","ABC6");
-INSERT INTO matable VALUES(7,"XYZ7","ABC7");
-INSERT INTO matable VALUES(8,"XYZ8","ABC8");
-INSERT INTO matable VALUES(9,"XYZ9","ABC9");
-select * from matable order by nid;
-
+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
-USE gotoslave;
-select * from matable order by nid;
+select * from t1 order by nid;

-# connect to master delete a row and make sure it is gone.
--connection master
-delete from matable where nid=3;
-select * from matable order by nid;
-
-# connect to the slave and make sure the row is gone.
---sync_slave_with_master
---connection slave
-select * from matable order by nid;
-
---connection master
-
-#source ./file1;
-delete from matable;
-INSERT INTO matable VALUES(1,"XYZ1","ABC1");
-INSERT INTO matable VALUES(2,"XYZ2","ABC2");
-INSERT INTO matable VALUES(3,"XYZ3","ABC3");
-INSERT INTO matable VALUES(4,"XYZ4","ABC4");
-INSERT INTO matable VALUES(5,"XYZ5","ABC5");
-INSERT INTO matable VALUES(6,"XYZ6","ABC6");
-INSERT INTO matable VALUES(7,"XYZ7","ABC7");
-INSERT INTO matable VALUES(8,"XYZ8","ABC8");
-INSERT INTO matable VALUES(9,"XYZ9","ABC9");
+delete from t1;
+INSERT INTO t1 VALUES(1,"XYZ1","ABC1"),(2,"XYZ2","ABC2");
# Make sure all rows are on the master
-select * from matable order by nid;
+select * from t1 order by nid;

-# make sure all rows are on the slave. Witout a pending patch, row with nid 3 is missing`
+# make sure all rows are on the slave.
--sync_slave_with_master
--connection slave
-select * from matable order by nid;
+# Bug #11087 would have row with nid 2 missing
+select * from t1 order by nid;

-DROP DATABASE gotoslave;
+DROP table t1;

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw