bk commit into 5.1 tree (jonas:1.2291)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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@stripped, 2006-08-29 10:47:28+02:00, jonas@stripped +3 -0
  ndb -
    Add order by in rpl_(ndb)_multi_update3 to make result deterministic

  mysql-test/extra/rpl_tests/rpl_multi_update3.test@stripped, 2006-08-29 10:47:27+02:00, jonas@stripped +1 -1
    Add order by in rpl_(ndb)_multi_update3 to make result deterministic

  mysql-test/r/rpl_multi_update3.result@stripped, 2006-08-29 10:47:27+02:00, jonas@stripped +1 -1
    Add order by in rpl_(ndb)_multi_update3 to make result deterministic

  mysql-test/r/rpl_ndb_multi_update3.result@stripped, 2006-08-29 10:47:27+02:00, jonas@stripped +1 -1
    Add order by in rpl_(ndb)_multi_update3 to make result deterministic

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.9/mysql-test/r/rpl_multi_update3.result	2006-08-29 10:47:33 +02:00
+++ 1.10/mysql-test/r/rpl_multi_update3.result	2006-08-29 10:47:33 +02:00
@@ -25,7 +25,7 @@
 a	b
 1	0
 2	1
-UPDATE t2, (SELECT a FROM t1) AS t SET t2.b = t.a+5 ;
+UPDATE t2, (SELECT a FROM t1 ORDER BY a) AS t SET t2.b = t.a+5 ;
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	0

--- 1.3/mysql-test/r/rpl_ndb_multi_update3.result	2006-08-29 10:47:33 +02:00
+++ 1.4/mysql-test/r/rpl_ndb_multi_update3.result	2006-08-29 10:47:33 +02:00
@@ -25,7 +25,7 @@
 a	b
 1	0
 2	1
-UPDATE t2, (SELECT a FROM t1) AS t SET t2.b = t.a+5 ;
+UPDATE t2, (SELECT a FROM t1 ORDER BY a) AS t SET t2.b = t.a+5 ;
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	0

--- 1.2/mysql-test/extra/rpl_tests/rpl_multi_update3.test	2006-08-29 10:47:33 +02:00
+++ 1.3/mysql-test/extra/rpl_tests/rpl_multi_update3.test	2006-08-29 10:47:33 +02:00
@@ -27,7 +27,7 @@
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
 
-UPDATE t2, (SELECT a FROM t1) AS t SET t2.b = t.a+5 ;
+UPDATE t2, (SELECT a FROM t1 ORDER BY a) AS t SET t2.b = t.a+5 ;
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;