Merge "deferred: make DeferredUpdates::attemptUpdate() use callback owners for $fname...

[lhc/web/wiklou.git] / includes / libs / rdbms / database / DBConnRef.php

diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index 2c9858a..f0b135f 100644 (file)
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -80,6 +80,11 @@ class DBConnRef implements IDatabase {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
+       /**
+        * @param bool|null $buffer
+        * @return bool
+        * @deprecated Since 1.34 Use query batching
+        */
        public function bufferResults( $buffer = null ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
@@ -140,10 +145,6 @@ class DBConnRef implements IDatabase {
                throw new DBUnexpectedError( $this, "Database injection is disallowed to enable reuse." );
        }
 
-       public function implicitGroupby() {
-               return $this->__call( __FUNCTION__, func_get_args() );
-       }
-
        public function implicitOrderby() {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
@@ -152,10 +153,6 @@ class DBConnRef implements IDatabase {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
-       public function doneWrites() {
-               return $this->__call( __FUNCTION__, func_get_args() );
-       }
-
        public function lastDoneWrites() {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
@@ -218,13 +215,6 @@ class DBConnRef implements IDatabase {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
-       /**
-        * @codeCoverageIgnore
-        */
-       public function getWikiID() {
-               return $this->getDomainID();
-       }
-
        public function getType() {
                if ( $this->conn === null ) {
                        // Avoid triggering a database connection