Browse Source

Added order by

pull/374/head
unknown 20 years ago
parent
commit
3f19b05bb0
  1. 8
      mysql-test/r/ndb_lock.result
  2. 4
      mysql-test/t/ndb_lock.test

8
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

4
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;

Loading…
Cancel
Save