From dfc1675f319d32afc4215014813052ee3581f9e5 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 23 Nov 2011 21:03:57 +0000 Subject: [PATCH] Reverted 'lockTimeout' option from r104069: table_lock_wait_timeout is GLOBAL and the other one requires an innoDB plugin...so that was useless. --- includes/db/Database.php | 1 - includes/db/DatabaseMysql.php | 5 ----- 2 files changed, 6 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index ac2f159f72..38d1dbec35 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -3010,7 +3010,6 @@ abstract class DatabaseBase implements DatabaseType { * May be useful for very long batch queries such as * full-wiki dumps, where a single query reads out over * hours or days. - * 'lockTimeout' : Set the lock wait timeout value in seconds. * * @param $options Array * @return void diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php index 3a93e0f198..793815bf03 100644 --- a/includes/db/DatabaseMysql.php +++ b/includes/db/DatabaseMysql.php @@ -608,11 +608,6 @@ class DatabaseMysql extends DatabaseBase { $this->query( "SET net_read_timeout=$timeout" ); $this->query( "SET net_write_timeout=$timeout" ); } - if ( isset( $options['lockTimeout'] ) ) { - $timeout = (int)$options['lockTimeout']; - $this->query( "SET table_lock_wait_timeout=$timeout" ); // table level - $this->query( "SET innodb_lock_wait_timeout=$timeout" ); // row level - } } public function lock( $lockName, $method, $timeout = 5 ) { -- 2.20.1