diff options
| author | unknown <monty@mysql.com> | 2004-10-20 16:04:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-20 16:04:28 +0300 |
| commit | ec8779e95a46b3dfff492196ad004cb2716df3c3 (patch) | |
| tree | 23e87e07794af4dd31668c4f6f75475638445d9c /mysql-test/r/innodb-lock.result | |
| parent | 95f0e39a38435e0451e77c919ce21697eaccd334 (diff) | |
| download | mariadb-git-ec8779e95a46b3dfff492196ad004cb2716df3c3.tar.gz | |
Fix test case for innodb-lock
mysql-test/r/innodb-lock.result:
Fix test case (old one didn't test things correctly)
mysql-test/t/innodb-lock.test:
Fix test case (old one didn't test things correctly)
mysys/thr_lock.c:
More debugging information
sql/mysqld.cc:
Enable innodb_table_locks as default, as otherwise there is a possibility for deadlocks
sql/sql_base.cc:
More debug information
Diffstat (limited to 'mysql-test/r/innodb-lock.result')
| -rw-r--r-- | mysql-test/r/innodb-lock.result | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/mysql-test/r/innodb-lock.result b/mysql-test/r/innodb-lock.result index f87f221ea66..407a85ed038 100644 --- a/mysql-test/r/innodb-lock.result +++ b/mysql-test/r/innodb-lock.result @@ -1,7 +1,7 @@ -drop table if exists t1; select @@innodb_table_locks; @@innodb_table_locks -0 +1 +drop table if exists t1; set @@innodb_table_locks=1; create table t1 (id integer, x integer) engine=INNODB; insert into t1 values(0, 0); @@ -25,24 +25,32 @@ id x 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; +create table t1 (id integer primary key, x integer) engine=INNODB; +insert into t1 values(0, 0),(1,1),(2,2); +commit; SELECT * from t1 where id = 0 FOR UPDATE; id x 0 0 set autocommit=0; +set @@innodb_table_locks=0; lock table t1 write; -update t1 set x=1 where id = 0; -select * from t1; +update t1 set x=10 where id = 2; +SELECT * from t1 where id = 2; id x -0 1 +2 2 +UPDATE t1 set x=3 where id = 2; commit; -update t1 set x=2 where id = 0; +SELECT * from t1; +id x +0 0 +1 1 +2 3 commit; unlock tables; +commit; select * from t1; id x -0 2 -commit; +0 0 +1 1 +2 10 drop table t1; |