Commit 713302b1 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/M40/mysql-4.0
parents d4342115 3bdd7e77

mysql-test/r/innodb-lock.result

+1 −0
Original line number Diff line number Diff line 
set global innodb_table_locks=1;

select @@innodb_table_locks;

@@innodb_table_locks

1

mysql-test/t/innodb-lock-master.opt

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
--innodb-table-lock=1

mysql-test/t/innodb-lock.test

+5 −0
Original line number Diff line number Diff line
@@ -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