jenkins-bot has submitted this change and it was merged.
Change subject: Remove version check for mysql 4.1 from Maintenance scripts
......................................................................
Remove version check for mysql 4.1 from Maintenance scripts
Removed version check for mysql from initEditCount.php and
storage/fixBug20757.php. Mediawiki needs MYSQL Ver 5.0.2 or
later, so the check is unnecessary.
Removed white spaces
Bug: 59126
Change-Id: I29e2ca8764fad8bf4d15bba307e80f3aacea1db7
---
M maintenance/initEditCount.php
M maintenance/storage/fixBug20757.php
2 files changed, 2 insertions(+), 7 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
Parent5446: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php
index 4b04683..7c6e7d4 100644
--- a/maintenance/initEditCount.php
+++ b/maintenance/initEditCount.php
@@ -47,7 +47,7 @@
// Autodetect mode...
$backgroundMode = wfGetLB()->getServerCount() > 1 ||
- ( $dbw instanceof DatabaseMysql && version_compare(
$dbver, '4.1' ) < 0 );
+ ( $dbw instanceof DatabaseMysql );
if ( $this->hasOption( 'background' ) ) {
$backgroundMode = true;
diff --git a/maintenance/storage/fixBug20757.php
b/maintenance/storage/fixBug20757.php
index e832b4e..dd86619 100644
--- a/maintenance/storage/fixBug20757.php
+++ b/maintenance/storage/fixBug20757.php
@@ -57,14 +57,9 @@
$totalRevs = $dbr->selectField( 'text', 'MAX(old_id)', false,
__METHOD__ );
- if ( $dbr->getType() == 'mysql'
- && version_compare( $dbr->getServerVersion(), '4.1.0',
'>=' )
- ) {
+ if ( $dbr->getType() == 'mysql' ) {
// In MySQL 4.1+, the binary field old_text has a
non-working LOWER() function
$lowerLeft = 'LOWER(CONVERT(LEFT(old_text,22) USING
latin1))';
- } else {
- // No CONVERT() in MySQL 4.0
- $lowerLeft = 'LOWER(LEFT(old_text,22))';
}
while ( true ) {
--
To view, visit https://gerrit.wikimedia.org/r/104713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29e2ca8764fad8bf4d15bba307e80f3aacea1db7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Daniel Friesen <dan...@nadir-seen-fire.com>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
