aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>2021-05-20 21:06:03 +0000
committerGerrit Code Review <gerrit@wikimedia.org>2021-05-20 21:06:03 +0000
commit917e1aae828469c8d77baeebeed15c1f2dfbbd08 (patch)
tree68e5b1fcfb006dbe035d113901fe021346cee1f2
parenta4bd3fee84d10680ea42a45bef2738fa9ae52a6c (diff)
parent40ec032cdb6667321d7bc2b1519416336c6bc09a (diff)
downloadmediawikicore-917e1aae828469c8d77baeebeed15c1f2dfbbd08.tar.gz
mediawikicore-917e1aae828469c8d77baeebeed15c1f2dfbbd08.zip
Merge "rdbms: Fix outdated docs url in DatabaseMysqlBase::makeLockName"
-rw-r--r--includes/libs/rdbms/database/DatabaseMysqlBase.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index fbde5c1efd31..c8a3454d8a3e 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -1252,8 +1252,6 @@ abstract class DatabaseMysqlBase extends Database {
}
/**
- * See
- * https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_release-lock
* @param string $lockName
* @param string $method
* @return bool
@@ -1262,6 +1260,7 @@ abstract class DatabaseMysqlBase extends Database {
$encName = $this->addQuotes( $this->makeLockName( $lockName ) );
$flags = self::QUERY_IGNORE_DBO_TRX | self::QUERY_CHANGE_NONE;
+ // https://dev.mysql.com/doc/refman/5.7/en/locking-functions.html#function_release-lock
$res = $this->query( "SELECT RELEASE_LOCK($encName) as lockstatus", $method, $flags );
$row = $this->fetchObject( $res );
@@ -1276,8 +1275,8 @@ abstract class DatabaseMysqlBase extends Database {
}
private function makeLockName( $lockName ) {
- // https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_get-lock
- // Newer version enforce a 64 char length limit.
+ // https://dev.mysql.com/doc/refman/5.7/en/locking-functions.html#function_get-lock
+ // MySQL 5.7+ enforces a 64 char length limit.
return ( strlen( $lockName ) > 64 ) ? sha1( $lockName ) : $lockName;
}