mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse source 
into mysql.com:/M40/mysql-4.0
This commit is contained in:
joerg@mysql.com 2004-10-27 19:40:22 +02:00
commit 4437787b78
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/innodb-lock.result
View file

@ -1,3 +1,4 @@
set global innodb_table_locks=1;
select @@innodb_table_locks;
@@innodb_table_locks
1

1
mysql-test/t/innodb-lock-master.opt
View file

@ -1 +0,0 @@
--innodb-table-lock=1

5
mysql-test/t/innodb-lock.test
View file

@ -4,6 +4,8 @@
# Check and select innodb lock type
#
set global innodb_table_locks=1;
select @@innodb_table_locks;
#
@ -12,7 +14,10 @@ select @@innodb_table_locks;
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
--disable_warnings
drop table if exists t1;
--enable_warnings
#
# Testing of explicit table locks with enforced table locks