Merge "Remove Cdb compat class names"

diff --combined RELEASE-NOTES-1.30
index 04491a8,2d50abb..8638c44
--- 1/RELEASE-NOTES-1.30
--- 2/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@@ -33,10 -33,6 +33,10 @@@ section)
    use $wgFragmentMode to migrate off it to a modern alternative.
  * $wgExternalInterwikiFragmentMode was introduced to control how fragments in
    sinterwikis going outside of current wiki farm are encoded.
 +* (T120333) Soft-deprecated the use of PHP extension 'mysql' in favor of 'mysqli'.
 +  This PHP extension was deprecated in PHP 5.5 and removed in PHP 7.0. MediaWiki
 +  auto-selects the 'mysqli' driver since MediaWiki 1.22, except if explicitly
 +  requested through the configuration parameter $wgDBservers.
  
  === New features in 1.30 ===
  * (T37247) Output from Parser::parse() will now be wrapped in a div with
@@@ -175,6 -171,8 +175,8 @@@ changes to languages because of Phabric
  * Removed 'jquery.mwExtension' module. (deprecated since 1.26)
  * mediawiki.ui: Deprecate greys, which are not part of WikimediaUI color palette
    any more.
+ * CdbReader, CdbWriter, CdbException classes (deprecated in 1.25) were removed.
+   The namespaced classes in the Cdb namespace should be used instead.
  
  == Compatibility ==
  MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for

diff --combined autoload.php
index aeecac7,759a501..c17838e
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -226,9 -226,6 +226,6 @@@ $wgAutoloadLocalClasses = 
        'CategoryPage' => __DIR__ . '/includes/page/CategoryPage.php',
        'CategoryPager' => __DIR__ . '/includes/specials/pagers/CategoryPager.php',
        'CategoryViewer' => __DIR__ . '/includes/CategoryViewer.php',
-       'CdbException' => __DIR__ . '/includes/compat/CdbCompat.php',
-       'CdbReader' => __DIR__ . '/includes/compat/CdbCompat.php',
-       'CdbWriter' => __DIR__ . '/includes/compat/CdbCompat.php',
        'CdnCacheUpdate' => __DIR__ . '/includes/deferred/CdnCacheUpdate.php',
        'CdnPurgeJob' => __DIR__ . '/includes/jobqueue/jobs/CdnPurgeJob.php',
        'CentralIdLookup' => __DIR__ . '/includes/user/CentralIdLookup.php',
@@@ -367,6 -364,7 +364,6 @@@
        'DeleteLogFormatter' => __DIR__ . '/includes/logging/DeleteLogFormatter.php',
        'DeleteOldRevisions' => __DIR__ . '/maintenance/deleteOldRevisions.php',
        'DeleteOrphanedRevisions' => __DIR__ . '/maintenance/deleteOrphanedRevisions.php',
 -      'DeleteRevision' => __DIR__ . '/maintenance/deleteRevision.php',
        'DeleteSelfExternals' => __DIR__ . '/maintenance/deleteSelfExternals.php',
        'DeletedContribsPager' => __DIR__ . '/includes/specials/pagers/DeletedContribsPager.php',
        'DeletedContributionsPage' => __DIR__ . '/includes/specials/SpecialDeletedContributions.php',