From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 21 Mar 2019 21:22:34 +0000 (-0700)
Subject: rdbms: update wasQueryTimeout() for DatabaseMysqlBase
X-Git-Tag: 1.34.0-rc.0~2414^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=c6c63251004d8bc77e6ce6e95cf24c5dc4b6f1ab;p=lhc%2Fweb%2Fwiklou.git

rdbms: update wasQueryTimeout() for DatabaseMysqlBase

Change-Id: I533d68972c758a5c8bb251cd838b8802799f0318
---

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 1a406cf9a1..88dcca72d4 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -486,7 +486,9 @@ abstract class DatabaseMysqlBase extends Database {
 	abstract protected function mysqlError( $conn = null );
 
 	protected function wasQueryTimeout( $error, $errno ) {
-		return $errno == 2062;
+		// https://dev.mysql.com/doc/refman/8.0/en/client-error-reference.html
+		// https://phabricator.wikimedia.org/T170638
+		return in_array( $errno, [ 2062, 3024 ] );
 	}
 
 	public function replace( $table, $uniqueIndexes, $rows, $fname = __METHOD__ ) {