From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 5 Sep 2019 18:22:31 +0000 (-0700)
Subject: rdbms: suppress warnings during DatabaseMysqli::doQuery()
X-Git-Tag: 1.34.0-rc.0~373^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=d9702e90689c015c4876e83506e8c331893fc647

rdbms: suppress warnings during DatabaseMysqli::doQuery()

There is already logging and error handling via SPI and exceptions.
Having warnings just makes redundant log entries, some of which are
for minor things like recoverable disconnections.

Bug: T228092
Change-Id: I582b5e431c80cebeab177bacfb6445f8588e8cdb
---

diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php b/includes/libs/rdbms/database/DatabaseMysqli.php
index 106772b346..b9a1af625c 100644
--- a/includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/includes/libs/rdbms/database/DatabaseMysqli.php
@@ -26,6 +26,7 @@ use mysqli;
 use mysqli_result;
 use IP;
 use stdClass;
+use Wikimedia\AtEase\AtEase;
 
 /**
  * Database abstraction object for PHP extension mysqli.
@@ -41,7 +42,11 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 	 * @return mysqli_result|bool
 	 */
 	protected function doQuery( $sql ) {
-		return $this->getBindingHandle()->query( $sql );
+		AtEase::suppressWarnings();
+		$res = $this->getBindingHandle()->query( $sql );
+		AtEase::restoreWarnings();
+
+		return $res;
 	}
 
 	/**