bk commit into 5.1 tree (tomas:1.1944)

[tomas]

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/installing-source-tree.html

ChangeSet
  1.1944 05/06/07 12:36:00 tomas@stripped +2 -0
  rpl_ndb_basic.test, rpl_ndb_basic.result:
    simplified test

  mysql-test/t/rpl_ndb_basic.test
    1.5 05/06/07 12:35:37 tomas@stripped +1 -2
    simplified test

  mysql-test/r/rpl_ndb_basic.result
    1.3 05/06/07 12:35:37 tomas@stripped +3 -5
    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.2/mysql-test/r/rpl_ndb_basic.result	2005-06-07 12:02:46 +02:00
+++ 1.3/mysql-test/r/rpl_ndb_basic.result	2005-06-07 12:35:37 +02:00
@@ -17,13 +17,11 @@
 nid	nom	prenom
 1	XYZ1	ABC1
 delete from t1;
-INSERT INTO t1 VALUES(1,"XYZ1","ABC1"),(2,"XYZ2","ABC2");
+INSERT INTO t1 VALUES(1,"XYZ2","ABC2");
 select * from t1 order by nid;
 nid	nom	prenom
-1	XYZ1	ABC1
-2	XYZ2	ABC2
+1	XYZ2	ABC2
 select * from t1 order by nid;
 nid	nom	prenom
-1	XYZ1	ABC1
-2	XYZ2	ABC2
+1	XYZ2	ABC2
 DROP table t1;

--- 1.4/mysql-test/t/rpl_ndb_basic.test	2005-06-07 12:02:46 +02:00
+++ 1.5/mysql-test/t/rpl_ndb_basic.test	2005-06-07 12:35:37 +02:00
@@ -15,7 +15,6 @@
 		    PRIMARY KEY  (`nid`)) 
     ENGINE=ndbcluster DEFAULT CHARSET=latin1;
 
-#source ./file2; This was the data from file2
 INSERT INTO t1 VALUES(1,"XYZ1","ABC1");
 select * from t1 order by nid;
 
@@ -26,7 +25,7 @@
 
 --connection master
 delete from t1;
-INSERT INTO t1 VALUES(1,"XYZ1","ABC1"),(2,"XYZ2","ABC2");
+INSERT INTO t1 VALUES(1,"XYZ2","ABC2");
 # Make sure all rows are on the master
 select * from t1 order by nid;