Commit 9ec8dba6 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents d4ffbe74 8501296a

mysql-test/extra/rpl_tests/rpl_multi_update3.test

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ INSERT INTO t2 VALUES (NULL, 0), (NULL,1); 
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;

mysql-test/r/rpl_multi_update3.result

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ SELECT * FROM t2 ORDER BY a; 
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

mysql-test/r/rpl_ndb_multi_update3.result

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ SELECT * FROM t2 ORDER BY a; 
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