bk commit into 5.1 tree (tulin:1.1982)

[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.1982 05/06/23 00:56:29 tulin@stripped +1 -0
  rpl_row_basic_7ndb.result:
    corrected result file

  mysql-test/r/rpl_row_basic_7ndb.result
    1.10 05/06/23 00:40:07 ndbdev@stripped +1 -6
    corrected result 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:	tulin
# Host:	dl145c.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1-wl2325

--- 1.9/mysql-test/r/rpl_row_basic_7ndb.result	Fri May  6 11:21:57 2005
+++ 1.10/mysql-test/r/rpl_row_basic_7ndb.result	Thu Jun 23 00:40:07 2005
@@ -136,12 +136,7 @@
 7	A	49
 9	A	81
 UPDATE t2 SET c12='X';
-CREATE TABLE t3 (C1 CHAR(1), C2 CHAR(1), pk1 int, C3 CHAR(1), pk2 char(20),
-primary key (pk1,pk2)) ENGINE = 'NDB'  ;
-SELECT * FROM t3 ORDER BY C1,C2;
-C1	C2	pk1	C3	pk2
-SELECT * FROM t3 ORDER BY C1,C2;
-C1	C2	pk1	C3	pk2
+CREATE TABLE t3 (C1 CHAR(1), C2 CHAR(1), pk1 INT, C3 CHAR(1), pk2 INT, PRIMARY KEY
(pk1,pk2)) ENGINE = 'NDB'  ;
 INSERT INTO t3 VALUES ('A','B',1,'B',1), ('X','Y',2,'B',1), ('X','X',3,'B',1);
 INSERT INTO t3 VALUES ('A','C',1,'B',2), ('X','Z',2,'B',2), ('A','A',3,'B',2);
 SELECT * FROM t3 ORDER BY C1,C2;