diff options
| author | unknown <joerg@mysql.com> | 2004-10-27 19:40:22 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2004-10-27 19:40:22 +0200 |
| commit | 713302b10610a74a7e41e82325a6004733244acb (patch) | |
| tree | bc0b3422bead49ebc70ca24a68b4ee9783f4389a | |
| parent | d43421155e1f8d70fbe0abebf6a04d56b93d4670 (diff) | |
| parent | 3bdd7e77fdb66acb4d051dec2b1c4fd136a49f9c (diff) | |
| download | mariadb-git-713302b10610a74a7e41e82325a6004733244acb.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
| -rw-r--r-- | mysql-test/r/innodb-lock.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/innodb-lock-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/innodb-lock.test | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/r/innodb-lock.result b/mysql-test/r/innodb-lock.result index 407a85ed038..4ace4065c34 100644 --- a/mysql-test/r/innodb-lock.result +++ b/mysql-test/r/innodb-lock.result @@ -1,3 +1,4 @@ +set global innodb_table_locks=1; select @@innodb_table_locks; @@innodb_table_locks 1 diff --git a/mysql-test/t/innodb-lock-master.opt b/mysql-test/t/innodb-lock-master.opt deleted file mode 100644 index 403fcde87ed..00000000000 --- a/mysql-test/t/innodb-lock-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb-table-lock=1 diff --git a/mysql-test/t/innodb-lock.test b/mysql-test/t/innodb-lock.test index 430369f4fda..a3b6f8993f2 100644 --- a/mysql-test/t/innodb-lock.test +++ b/mysql-test/t/innodb-lock.test @@ -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 |