From 3f19b05bb00366df88d72f9b6507f897f2f9370b Mon Sep 17 00:00:00 2001
From: unknown <mskold@mysql.com>
Date: Mon, 12 Jun 2006 15:36:12 +0200
Subject: [PATCH] Added order by

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

diff --git a/mysql-test/r/ndb_lock.result b/mysql-test/r/ndb_lock.result
index 92a73830662..3b433023843 100644
--- a/mysql-test/r/ndb_lock.result
+++ b/mysql-test/r/ndb_lock.result
@@ -78,10 +78,10 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 rollback;
 commit;
 begin;
-select * from t1 where y = 'one' or y = 'three' for update;
+select * from t1 where y = 'one' or y = 'three' order by x for update;
 x	y	z
-3	three	3
 1	one	1
+3	three	3
 begin;
 select * from t1 where x = 1 for update;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
@@ -115,10 +115,10 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 rollback;
 commit;
 begin;
-select * from t1 where y = 'one' or y = 'three' lock in share mode;
+select * from t1 where y = 'one' or y = 'three' order by x lock in share mode;
 x	y	z
-3	three	3
 1	one	1
+3	three	3
 begin;
 select * from t1 where y = 'one' lock in share mode;
 x	y	z
diff --git a/mysql-test/t/ndb_lock.test b/mysql-test/t/ndb_lock.test
index 6d3257aeb68..54214ee72ec 100644
--- a/mysql-test/t/ndb_lock.test
+++ b/mysql-test/t/ndb_lock.test
@@ -93,7 +93,7 @@ commit;
 # table scan
 connection con1;
 begin;
-select * from t1 where y = 'one' or y = 'three' for update;
+select * from t1 where y = 'one' or y = 'three' order by x for update;
 
 connection con2;
 begin;
@@ -146,7 +146,7 @@ commit;
 # table scan
 connection con1;
 begin;
-select * from t1 where y = 'one' or y = 'three' lock in share mode;
+select * from t1 where y = 'one' or y = 'three' order by x lock in share mode;
 
 connection con2;
 begin;