Merge "Add .pipeline/ with dev image variant"

[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 f27d042..7870f69 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() );
        }
@@ -275,7 +280,7 @@ class DBConnRef implements IDatabase {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
-       public function close() {
+       public function close( $fname = __METHOD__, $owner = null ) {
                throw new DBUnexpectedError( $this->conn, 'Cannot close shared connection.' );
        }