Merge "Revert "Made LCStoreDB try to use a separate DB connection""

diff --combined includes/cache/LocalisationCache.php
index c0c5977,d3721c9..e2e304a
--- 1/includes/cache/LocalisationCache.php
--- 2/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@@ -20,6 -20,8 +20,6 @@@
   * @file
   */
  
 -define( 'MW_LC_VERSION', 2 );
 -
  /**
   * Class for caching the contents of localisation files, Messages*.php
   * and *.i18n.php.
@@@ -33,8 -35,6 +33,8 @@@
   * as grammatical transformation, is done by the caller.
   */
  class LocalisationCache {
 +      const VERSION = 2;
 +
        /** Configuration associative array */
        private $conf;
  
@@@ -773,7 -773,7 +773,7 @@@
         *
         * Returns true if any data from the extension array was used, false
         * otherwise.
 -       * @param string $codeSequence
 +       * @param array $codeSequence
         * @param string $key
         * @param mixed $value
         * @param mixed $fallbackValue
@@@ -913,7 -913,7 +913,7 @@@
                # Add cache dependencies for any referenced globals
                $deps['wgExtensionMessagesFiles'] = new GlobalDependency( 'wgExtensionMessagesFiles' );
                $deps['wgMessagesDirs'] = new GlobalDependency( 'wgMessagesDirs' );
 -              $deps['version'] = new ConstantDependency( 'MW_LC_VERSION' );
 +              $deps['version'] = new ConstantDependency( 'LocalisationCache::VERSION' );
  
                # Add dependencies to the cache entry
                $allData['deps'] = $deps;
@@@ -1163,8 -1163,8 +1163,8 @@@ class LCStoreDB implements LCStore 
        private $readOnly = false;
  
        public function get( $code, $key ) {
-               if ( $this->writesDone && $this->dbw ) {
-                       $db = $this->dbw;
+               if ( $this->writesDone ) {
+                       $db = wfGetDB( DB_MASTER );
                } else {
                        $db = wfGetDB( DB_SLAVE );
                }
@@@ -1184,16 -1184,7 +1184,7 @@@
                        throw new MWException( __METHOD__ . ": Invalid language \"$code\"" );
                }
  
-               // We must keep a separate connection to MySQL in order to avoid breaking
-               // main transactions. However, SQLite deadlocks when using two connections.
-               // @todo get this trick to work on PostgreSQL too
-               if ( wfGetDB( DB_MASTER )->getType() == 'mysql' ) {
-                       $lb = wfGetLBFactory()->newMainLB();
-                       $this->dbw = $lb->getConnection( DB_MASTER );
-                       $this->dbw->clearFlag( DBO_TRX ); // auto-commit mode
-               } else {
-                       $this->dbw = wfGetDB( DB_MASTER );
-               }
+               $this->dbw = wfGetDB( DB_MASTER );
  
                $this->currentLang = $code;
                $this->batch = array();