summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb-lock.result
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-10-20 11:25:46 +0300
committerunknown <monty@mysql.com>2004-10-20 11:25:46 +0300
commit95f0e39a38435e0451e77c919ce21697eaccd334 (patch)
treec21f43f19b7e410011d90316a1266b6e5fd80efb /mysql-test/r/innodb-lock.result
parent0e0c9af593367797d844058bfff0534b53c7fe12 (diff)
parented8ec2cf1613e1bb57705698b8962e767fd89320 (diff)
downloadmariadb-git-95f0e39a38435e0451e77c919ce21697eaccd334.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0 libmysql/libmysql.c: Auto merged
Diffstat (limited to 'mysql-test/r/innodb-lock.result')
-rw-r--r--mysql-test/r/innodb-lock.result26
1 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/innodb-lock.result b/mysql-test/r/innodb-lock.result
index cf00adb30ae..f87f221ea66 100644
--- a/mysql-test/r/innodb-lock.result
+++ b/mysql-test/r/innodb-lock.result
@@ -1,4 +1,30 @@
drop table if exists t1;
+select @@innodb_table_locks;
+@@innodb_table_locks
+0
+set @@innodb_table_locks=1;
+create table t1 (id integer, x integer) engine=INNODB;
+insert into t1 values(0, 0);
+set autocommit=0;
+SELECT * from t1 where id = 0 FOR UPDATE;
+id x
+0 0
+set autocommit=0;
+lock table t1 write;
+update t1 set x=1 where id = 0;
+select * from t1;
+id x
+0 1
+commit;
+update t1 set x=2 where id = 0;
+commit;
+unlock tables;
+select * from t1;
+id x
+0 2
+commit;
+drop table t1;
+set @@innodb_table_locks=0;
create table t1 (id integer, x integer) engine=INNODB;
insert into t1 values(0, 0);
set autocommit=0;