Reverted 'lockTimeout' option from r104069: table_lock_wait_timeout is GLOBAL and...

diff --git a/includes/db/Database.php b/includes/db/Database.php
index ac2f159..38d1dbe 100644 (file)
--- 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 3a93e0f..793815b 100644 (file)
--- 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 ) {