summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2006-08-29 10:47:28 +0200
committerunknown <jonas@perch.ndb.mysql.com>2006-08-29 10:47:28 +0200
commit8501296a33a1b8bffe488aad95aa7cb4d694f87e (patch)
tree1ad49867815bd93a53f315b681040fa652209c6d
parent2479d3843e03448ac6392637d2682dcfe3c38db1 (diff)
downloadmariadb-git-8501296a33a1b8bffe488aad95aa7cb4d694f87e.tar.gz
ndb -
Add order by in rpl_(ndb)_multi_update3 to make result deterministic mysql-test/extra/rpl_tests/rpl_multi_update3.test: Add order by in rpl_(ndb)_multi_update3 to make result deterministic mysql-test/r/rpl_multi_update3.result: Add order by in rpl_(ndb)_multi_update3 to make result deterministic mysql-test/r/rpl_ndb_multi_update3.result: Add order by in rpl_(ndb)_multi_update3 to make result deterministic
-rw-r--r--mysql-test/extra/rpl_tests/rpl_multi_update3.test2
-rw-r--r--mysql-test/r/rpl_multi_update3.result2
-rw-r--r--mysql-test/r/rpl_ndb_multi_update3.result2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_multi_update3.test b/mysql-test/extra/rpl_tests/rpl_multi_update3.test
index 98fb085f0a8..797e385e509 100644
--- a/mysql-test/extra/rpl_tests/rpl_multi_update3.test
+++ b/mysql-test/extra/rpl_tests/rpl_multi_update3.test
@@ -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;
diff --git a/mysql-test/r/rpl_multi_update3.result b/mysql-test/r/rpl_multi_update3.result
index f20cecfb68f..dba7f770ba2 100644
--- a/mysql-test/r/rpl_multi_update3.result
+++ b/mysql-test/r/rpl_multi_update3.result
@@ -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
diff --git a/mysql-test/r/rpl_ndb_multi_update3.result b/mysql-test/r/rpl_ndb_multi_update3.result
index 2bbbe7785a9..dc4e11c9c9e 100644
--- a/mysql-test/r/rpl_ndb_multi_update3.result
+++ b/mysql-test/r/rpl_ndb_multi_update3.result
@@ -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