From c6c63251004d8bc77e6ce6e95cf24c5dc4b6f1ab Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 21 Mar 2019 14:22:34 -0700 Subject: [PATCH] rdbms: update wasQueryTimeout() for DatabaseMysqlBase Change-Id: I533d68972c758a5c8bb251cd838b8802799f0318 --- includes/libs/rdbms/database/DatabaseMysqlBase.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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__ ) { -- 2.20.1