From 31f9da92c495cf1ebae5e9e56a5fb4331e5ac69c Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 24 Mar 2018 05:17:12 -0700 Subject: [PATCH] rdbms: ignore DBO_IGNORE if passed into Database::__construct() Bug: T189999 Change-Id: I46369709a850acd85fe7d46da554514615f51300 --- includes/libs/rdbms/database/Database.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 5f2bbdbc1a..00d9b0b33d 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -283,6 +283,8 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware $this->flags |= self::DBO_TRX; } } + // Disregard deprecated DBO_IGNORE flag (T189999) + $this->flags &= ~self::DBO_IGNORE; $this->sessionVars = $params['variables']; @@ -1278,7 +1280,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware * @throws DBQueryError */ public function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) { - if ( $this->getFlag( self::DBO_IGNORE ) || $tempIgnore ) { + if ( $tempIgnore ) { $this->queryLogger->debug( "SQL ERROR (ignored): $error\n" ); } else { $sql1line = mb_substr( str_replace( "\n", "\\n", $sql ), 0, 5 * 1024 ); -- 2.20.1