database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Added order by

Browse Source
This commit is contained in:
mskold@mysql.com
2006-06-12 15:28:36 +02:00
parent 40e6161fdd
commit ae70201afb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/ndb_lock.result
View File

@@ -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
View File

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