From 10583f05c96c80f899e5817cdd3ba3c0feb31ee7 Mon Sep 17 00:00:00 2001
From: "magnus@neptunus.(none)" <>
Date: Wed, 28 Jul 2004 10:28:30 +0200
Subject: [PATCH] Added order by to make the test output from ndb_basic and
 ndb_lock predicatble

---
 mysql-test/r/ndb_basic.result |  6 +++---
 mysql-test/r/ndb_lock.result  | 16 ++++++++--------
 mysql-test/t/ndb_basic.test   |  4 ++--
 mysql-test/t/ndb_lock.test    |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result
index 7675048ca3c..b7479d9543d 100644
--- a/mysql-test/r/ndb_basic.result
+++ b/mysql-test/r/ndb_basic.result
@@ -24,15 +24,15 @@ pk1	attr1	attr2	attr3
 9410	1	NULL	9412
 9411	9413	17	9413
 UPDATE t1 SET pk1=2 WHERE attr1=1;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY pk1;
 pk1	attr1	attr2	attr3
 2	1	NULL	9412
 9411	9413	17	9413
 UPDATE t1 SET pk1=pk1 + 1;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY pk1;
 pk1	attr1	attr2	attr3
-9412	9413	17	9413
 3	1	NULL	9412
+9412	9413	17	9413
 DELETE FROM t1;
 SELECT * FROM t1;
 pk1	attr1	attr2	attr3
diff --git a/mysql-test/r/ndb_lock.result b/mysql-test/r/ndb_lock.result
index 94ff5c25e6b..505eb054afd 100644
--- a/mysql-test/r/ndb_lock.result
+++ b/mysql-test/r/ndb_lock.result
@@ -1,25 +1,25 @@
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 create table t1 (x integer not null primary key, y varchar(32)) engine = ndb;
 insert into t1 values (1,'one'), (2,'two');
-select * from t1;
+select * from t1 order by x;
 x	y
-2	two
 1	one
-select * from t1;
+2	two
+select * from t1 order by x;
 x	y
-2	two
 1	one
+2	two
 start transaction;
 insert into t1 values (3,'three');
 start transaction;
-select * from t1;
+select * from t1 order by x;
 x	y
-2	two
 1	one
+2	two
 commit;
-select * from t1;
+select * from t1 order by x;
 x	y
+1	one
 2	two
 3	three
-1	one
 commit;
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index 6c120e00942..08fbf913155 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -31,9 +31,9 @@ SELECT * FROM t1;
 
 # Update primary key
 UPDATE t1 SET pk1=2 WHERE attr1=1;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY pk1;
 UPDATE t1 SET pk1=pk1 + 1;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY pk1;
 
 # Delete the record
 DELETE FROM t1;
diff --git a/mysql-test/t/ndb_lock.test b/mysql-test/t/ndb_lock.test
index 431729516d6..852d641ed54 100644
--- a/mysql-test/t/ndb_lock.test
+++ b/mysql-test/t/ndb_lock.test
@@ -19,20 +19,20 @@ DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 connection con1;
 create table t1 (x integer not null primary key, y varchar(32)) engine = ndb;
 insert into t1 values (1,'one'), (2,'two');
-select * from t1;
+select * from t1 order by x;
 
 connection con2;
-select * from t1;
+select * from t1 order by x;
 
 connection con1;
 start transaction; insert into t1 values (3,'three');
 
 connection con2;
-start transaction; select * from t1;
+start transaction; select * from t1 order by x;
 
 connection con1;
 commit;
 
 connection con2;
-select * from t1;
+select * from t1 order by x;
 commit;