summaryrefslogtreecommitdiff
path: root/mysql-test/r/ndb_lock.result
diff options
context:
space:
mode:
authorunknown <mskold/marty@mysql.com/linux.site>2006-08-09 16:12:24 +0200
committerunknown <mskold/marty@mysql.com/linux.site>2006-08-09 16:12:24 +0200
commit2588f598090ae0cde455bf0df30a0484ba0ba4c3 (patch)
treebc6a80e4afa6687765be1684324b494801915f28 /mysql-test/r/ndb_lock.result
parent893ed9fca6b973f7cfa44032d30895de6725683d (diff)
downloadmariadb-git-2588f598090ae0cde455bf0df30a0484ba0ba4c3.tar.gz
bug #18184 SELECT ... FOR UPDATE does not work..: Updated result file
Diffstat (limited to 'mysql-test/r/ndb_lock.result')
-rw-r--r--mysql-test/r/ndb_lock.result15
1 files changed, 12 insertions, 3 deletions
diff --git a/mysql-test/r/ndb_lock.result b/mysql-test/r/ndb_lock.result
index 197995505a1..668c26aad03 100644
--- a/mysql-test/r/ndb_lock.result
+++ b/mysql-test/r/ndb_lock.result
@@ -64,17 +64,26 @@ pk u o
insert into t1 values (1,1,1);
drop table t1;
create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
-insert into t1 values (1,'one',1), (2,'two',2),(3,"three",3);
+insert into t1 values (1,'one',1);
begin;
select * from t1 where x = 1 for update;
x y z
1 one 1
begin;
-select * from t1 where x = 2 for update;
+select * from t1 where x = 1 for update;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+rollback;
+rollback;
+insert into t1 values (2,'two',2),(3,"three",3);
+begin;
+select * from t1 where x = 1 for update;
x y z
-2 two 2
+1 one 1
select * from t1 where x = 1 for update;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+select * from t1 where x = 2 for update;
+x y z
+2 two 2
rollback;
commit;
begin;