https://www.mediawiki.org/wiki/Special:Code/MediaWiki/104087
Revision: 104087
Author: aaron
Date: 2011-11-23 21:03:57 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Reverted 'lockTimeout' option from r104069: table_lock_wait_timeout is GLOBAL
and the other one requires an innoDB plugin...so that was useless.
Modified Paths:
--------------
trunk/phase3/includes/db/Database.php
trunk/phase3/includes/db/DatabaseMysql.php
Modified: trunk/phase3/includes/db/Database.php
===================================================================
--- trunk/phase3/includes/db/Database.php 2011-11-23 21:02:59 UTC (rev
104086)
+++ trunk/phase3/includes/db/Database.php 2011-11-23 21:03:57 UTC (rev
104087)
@@ -3010,7 +3010,6 @@
* 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
Modified: trunk/phase3/includes/db/DatabaseMysql.php
===================================================================
--- trunk/phase3/includes/db/DatabaseMysql.php 2011-11-23 21:02:59 UTC (rev
104086)
+++ trunk/phase3/includes/db/DatabaseMysql.php 2011-11-23 21:03:57 UTC (rev
104087)
@@ -608,11 +608,6 @@
$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 ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
