Merge "objectcache: add $flags argument to BagOStuff::delete()"

diff --cc includes/libs/objectcache/BagOStuff.php
Simple merge

diff --cc includes/objectcache/SqlBagOStuff.php
index fad7da9,522233b..eeb7355
--- 1/includes/objectcache/SqlBagOStuff.php
--- 2/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@@ -732,8 -731,22 +731,15 @@@ class SqlBagOStuff extends BagOStuff 
        protected function handleWriteError( DBError $exception, IDatabase $db = null, $serverIndex ) {
                if ( !$db ) {
                        $this->markServerDown( $exception, $serverIndex );
 -              } elseif ( $db->wasReadOnlyError() ) {
 -                      if ( $db->trxLevel() && $this->usesMainDB() ) {
 -                              // Errors like deadlocks and connection drops already cause rollback.
 -                              // For consistency, we have no choice but to throw an error and trigger
 -                              // complete rollback if the main DB is also being used as the cache DB.
 -                              throw $exception;
 -                      }
                }
  
+               $this->setAndLogDBError( $exception );
+       }
+ 
+       /**
+        * @param DBError $exception
+        */
+       private function setAndLogDBError( DBError $exception ) {
                $this->logger->error( "DBError: {$exception->getMessage()}" );
                if ( $exception instanceof DBConnectionError ) {
                        $this->setLastError( BagOStuff::ERR_UNREACHABLE );