From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 25 Mar 2019 14:45:20 +0000 (+0000)
Subject: Merge "DefaultSettings: Remove deprecated $wgDBmysql5 from core"
X-Git-Tag: 1.34.0-rc.0~2378
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=e73b5913ea7a82bb4fcd319653e98990f1e11999;hp=480c509de5f144f5dd0e260c3879d3ab5a37bc5b;p=lhc%2Fweb%2Fwiklou.git

Merge "DefaultSettings: Remove deprecated $wgDBmysql5 from core"
---

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 93d3253762..72a468b0a0 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -84,6 +84,8 @@ For notes on 1.32.x and older releases, see HISTORY.
   is no longer a problem, because the code now ensures the timestamp is always
   higher than the previous one. The writes are guarded with CAS logic (check
   and set), which prevents updates that would overlap.
+* $wgDBmysql5 (T196185) - This experimental setting, deprecated in 1.31, has
+  been removed.
 
 === New user-facing features in 1.33 ===
 * (T96041) __EXPECTUNUSEDCATEGORY__ on a category page causes the category
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 3afa593254..7a645a6bc8 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2114,26 +2114,6 @@ $wgDBerrorLog = false;
  */
 $wgDBerrorLogTZ = false;
 
-/**
- * Set to true to engage MySQL 4.1/5.0 charset-related features;
- * for now will just cause sending of 'SET NAMES=utf8' on connect.
- *
- * @warning THIS IS EXPERIMENTAL!
- *
- * May break if you're not using the table defs from mysql5/tables.sql.
- * May break if you're upgrading an existing wiki if set differently.
- * Broken symptoms likely to include incorrect behavior with page titles,
- * usernames, comments etc containing non-ASCII characters.
- * Might also cause failures on the object cache and other things.
- *
- * Even correct usage may cause failures with Unicode supplementary
- * characters (those not in the Basic Multilingual Plane) unless MySQL
- * has enhanced their Unicode support.
- *
- * @deprecated since 1.31
- */
-$wgDBmysql5 = false;
-
 /**
  * Set true to enable Oracle DCRP (supported from 11gR1 onward)
  *
diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index 6ed693ecb3..9851460bff 100644
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -122,7 +122,6 @@ abstract class MWLBFactory {
 						'tablePrefix' => $mainConfig->get( 'DBprefix' ),
 						'flags' => DBO_DEFAULT,
 						'sqlMode' => $mainConfig->get( 'SQLMode' ),
-						'utf8Mode' => $mainConfig->get( 'DBmysql5' )
 					];
 
 					$lbConf['servers'][$i] = $server;
@@ -142,7 +141,6 @@ abstract class MWLBFactory {
 					'load' => 1,
 					'flags' => $flags,
 					'sqlMode' => $mainConfig->get( 'SQLMode' ),
-					'utf8Mode' => $mainConfig->get( 'DBmysql5' )
 				];
 				if ( in_array( $server['type'], $typesWithSchema, true ) ) {
 					$server += [ 'schema' => $mainConfig->get( 'DBmwschema' ) ];
@@ -168,7 +166,6 @@ abstract class MWLBFactory {
 					$lbConf['serverTemplate']['schema'] = $mainConfig->get( 'DBmwschema' );
 				}
 				$lbConf['serverTemplate']['sqlMode'] = $mainConfig->get( 'SQLMode' );
-				$lbConf['serverTemplate']['utf8Mode'] = $mainConfig->get( 'DBmysql5' );
 			}
 		}