bk commit into 5.1 tree (jmiller:1.2061)

[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.2061 06/01/20 23:39:13 jmiller@stripped +2 -0
  rpl_foreign_key_innodb.result, rpl_foreign_key.test:
    had to add order by

  mysql-test/r/rpl_foreign_key_innodb.result
    1.3 06/01/20 23:38:47 jmiller@stripped +5 -5
    had to add order by

  mysql-test/extra/rpl_tests/rpl_foreign_key.test
    1.3 06/01/20 23:38:11 jmiller@stripped +4 -4
    had to add order by

# 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:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.2/mysql-test/extra/rpl_tests/rpl_foreign_key.test	2006-01-20 17:38:04 +01:00
+++ 1.3/mysql-test/extra/rpl_tests/rpl_foreign_key.test	2006-01-20 23:38:11 +01:00
@@ -11,11 +11,11 @@
 INSERT INTO t2 VALUES (5,0);
 INSERT INTO t2 VALUES (NULL,LAST_INSERT_ID());
 SET FOREIGN_KEY_CHECKS=1;
-SELECT * FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t1 ORDER BY a;
+SELECT * FROM t2 ORDER BY b;
 sync_slave_with_master;
-SELECT * FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t1 ORDER BY a;
+SELECT * FROM t2 ORDER BY b;
 
 connection master;
 SET TIMESTAMP=1000000000;

--- 1.2/mysql-test/r/rpl_foreign_key_innodb.result	2006-01-20 17:38:32 +01:00
+++ 1.3/mysql-test/r/rpl_foreign_key_innodb.result	2006-01-20 23:38:47 +01:00
@@ -12,23 +12,23 @@
 INSERT INTO t2 VALUES (5,0);
 INSERT INTO t2 VALUES (NULL,LAST_INSERT_ID());
 SET FOREIGN_KEY_CHECKS=1;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 a
 10
 11
 12
 13
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY b;
 b	c
 5	0
 6	11
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
 a
-12
 10
 11
+12
 13
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY b;
 b	c
 5	0
 6	11