jenkins-bot has submitted this change and it was merged.
Change subject: Tweaked User::READ_LOCKING to use LOCK IN SHARE MODE
......................................................................
Tweaked User::READ_LOCKING to use LOCK IN SHARE MODE
* This better alignes with IDBAccessObject docs and
still locks out INSERTs
Change-Id: Ib8713938e0afa14bee6f90bc51d6331eaf356447
---
M includes/User.php
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index 95ac0f1..339487d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3721,15 +3721,13 @@
: wfGetDB( DB_SLAVE );
$options = ( ( $flags & self::READ_LOCKING ) ==
self::READ_LOCKING )
- ? array( 'FOR UPDATE' )
+ ? array( 'LOCK IN SHARE MODE' )
: array();
- $id = $db->selectField( 'user', 'user_id', array( 'user_name'
=> $s ), __METHOD__, $options );
- if ( $id === false ) {
- $id = 0;
- }
+ $id = $db->selectField( 'user',
+ 'user_id', array( 'user_name' => $s ), __METHOD__,
$options );
- return $id;
+ return (int)$id;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/224647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8713938e0afa14bee6f90bc51d6331eaf356447
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
