Merge "Drop index oi_name_archive_name on table oldimage"

[lhc/web/wiklou.git] / includes / libs / rdbms / connectionmanager / ConnectionManager.php

diff --git a/includes/libs/rdbms/connectionmanager/ConnectionManager.php b/includes/libs/rdbms/connectionmanager/ConnectionManager.php
index 6d5d8ab..fc00965 100644 (file)
--- a/includes/libs/rdbms/connectionmanager/ConnectionManager.php
+++ b/includes/libs/rdbms/connectionmanager/ConnectionManager.php
@@ -6,7 +6,6 @@ use Database;
 use DBConnRef;
 use IDatabase;
 use InvalidArgumentException;
-use LoadBalancer;
 
 /**
  * Database connection manager.
@@ -138,43 +137,4 @@ class ConnectionManager {
                return $this->getConnectionRef( DB_REPLICA, $groups );
        }
 
-       /**
-        * Begins an atomic section and returns a database connection to the master DB, for updating.
-        *
-        * @since 1.29
-        *
-        * @param string $fname
-        *
-        * @return Database
-        */
-       public function beginAtomicSection( $fname ) {
-               $db = $this->getWriteConnection();
-               $db->startAtomic( $fname );
-
-               return $db;
-       }
-
-       /**
-        * @since 1.29
-        *
-        * @param IDatabase $db
-        * @param string $fname
-        */
-       public function commitAtomicSection( IDatabase $db, $fname ) {
-               $db->endAtomic( $fname );
-               $this->releaseConnection( $db );
-       }
-
-       /**
-        * @since 1.29
-        *
-        * @param IDatabase $db
-        * @param string $fname
-        */
-       public function rollbackAtomicSection( IDatabase $db, $fname ) {
-               // FIXME: there does not seem to be a clean way to roll back an atomic section?!
-               $db->rollback( $fname, 'flush' );
-               $this->releaseConnection( $db );
-       }
-
 }