From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 22 Mar 2019 00:39:12 +0000 (+0000)
Subject: Merge "rdbms: add 1062 error code to DatabaseMysqlBase"
X-Git-Tag: 1.34.0-rc.0~2415
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=ef1975aef2634e9ab56bc4364e1a1f2ca8854696;hp=eb8369f3698cc0269d04cf54a88b3034785cd8b2;p=lhc%2Fweb%2Fwiklou.git

Merge "rdbms: add 1062 error code to DatabaseMysqlBase"
---

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 1a406cf9a1..99339645b3 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -1407,7 +1407,7 @@ abstract class DatabaseMysqlBase extends Database {
 		}
 
 		// See https://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html
-		return in_array( $errno, [ 1022, 1216, 1217, 1137, 1146, 1051, 1054 ], true );
+		return in_array( $errno, [ 1022, 1062, 1216, 1217, 1137, 1146, 1051, 1054 ], true );
 	}
 
 	/**