Commit b10b25fb authored by unknown's avatar unknown
Browse files

Added order by

parent 7b207a83

mysql-test/r/ndb_lock.result

+4 −4
Original line number Diff line number Diff line
@@ -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 = 2 for update;

x	y	z
@@ -118,10 +118,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

mysql-test/t/ndb_lock.test

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -145,7 +145,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;