Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "rdbms: update wasQueryTimeout() for DatabaseMysqlBase"

Browse source
This commit is contained in:
jenkins-bot 2019-03-22 00:41:00 +00:00 committed by Gerrit Code Review
commit 3c3948a6f2
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/libs/rdbms/database/DatabaseMysqlBase.php
View file

@ -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__ ) {