diff options
| author | unknown <mskold@mysql.com> | 2006-06-12 15:35:47 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-06-12 15:35:47 +0200 |
| commit | b10b25fbb59fb10527c207154bbb65270beddb84 (patch) | |
| tree | ee1a9ed489895f1b1cf5bd02087e780fb87e60a7 | |
| parent | 7b207a8301e9adc7191c2771f57f309005eea86f (diff) | |
| download | mariadb-git-b10b25fbb59fb10527c207154bbb65270beddb84.tar.gz | |
Added order by
| -rw-r--r-- | mysql-test/r/ndb_lock.result | 8 | ||||
| -rw-r--r-- | 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 281b02b8228..875dcd775e6 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 = 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 diff --git a/mysql-test/t/ndb_lock.test b/mysql-test/t/ndb_lock.test index db42b7ec2dd..e8f7c57ac96 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; @@ -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; |