Merge changes I5d6baf6f,I2edfeaba

* changes:
  Don't use wfIsWindows() in CDB writers
  Clean up CDB classes

diff --combined includes/AutoLoader.php
index 9a63d38,96dda05..c7fd0c6
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -505,21 -505,21 +505,21 @@@ $wgAutoloadLocalClasses = array
        'ViewCountUpdate' => 'includes/deferred/ViewCountUpdate.php',
  
        # includes/diff
 -      '_DiffEngine' => 'includes/diff/DairikiDiff.php',
 -      '_DiffOp' => 'includes/diff/DairikiDiff.php',
 -      '_DiffOp_Add' => 'includes/diff/DairikiDiff.php',
 -      '_DiffOp_Change' => 'includes/diff/DairikiDiff.php',
 -      '_DiffOp_Copy' => 'includes/diff/DairikiDiff.php',
 -      '_DiffOp_Delete' => 'includes/diff/DairikiDiff.php',
 -      '_HWLDF_WordAccumulator' => 'includes/diff/DairikiDiff.php',
 -      'ArrayDiffFormatter' => 'includes/diff/DairikiDiff.php',
 +      'DiffEngine' => 'includes/diff/DairikiDiff.php',
 +      'DiffOp' => 'includes/diff/DairikiDiff.php',
 +      'DiffOp_Add' => 'includes/diff/DairikiDiff.php',
 +      'DiffOp_Change' => 'includes/diff/DairikiDiff.php',
 +      'DiffOp_Copy' => 'includes/diff/DairikiDiff.php',
 +      'DiffOp_Delete' => 'includes/diff/DairikiDiff.php',
 +      'HWLDF_WordAccumulator' => 'includes/diff/DairikiDiff.php',
 +      'ArrayDiffFormatter' => 'includes/diff/ArrayDiffFormatter.php',
        'Diff' => 'includes/diff/DairikiDiff.php',
        'DifferenceEngine' => 'includes/diff/DifferenceEngine.php',
 -      'DiffFormatter' => 'includes/diff/DairikiDiff.php',
 +      'DiffFormatter' => 'includes/diff/DiffFormatter.php',
        'MappedDiff' => 'includes/diff/DairikiDiff.php',
        'RangeDifference' => 'includes/diff/WikiDiff3.php',
 -      'TableDiffFormatter' => 'includes/diff/DairikiDiff.php',
 -      'UnifiedDiffFormatter' => 'includes/diff/DairikiDiff.php',
 +      'TableDiffFormatter' => 'includes/diff/TableDiffFormatter.php',
 +      'UnifiedDiffFormatter' => 'includes/diff/UnifiedDiffFormatter.php',
        'WikiDiff3' => 'includes/diff/WikiDiff3.php',
        'WordLevelDiff' => 'includes/diff/DairikiDiff.php',
  
@@@ -1046,12 -1046,13 +1046,13 @@@
  
        # includes/utils
        'ArrayUtils' => 'includes/utils/ArrayUtils.php',
+       'CdbException' => 'includes/utils/Cdb.php',
        'CdbFunctions' => 'includes/utils/CdbPHP.php',
        'CdbReader' => 'includes/utils/Cdb.php',
-       'CdbReaderDBA' => 'includes/utils/Cdb.php',
+       'CdbReaderDBA' => 'includes/utils/CdbDBA.php',
        'CdbReaderPHP' => 'includes/utils/CdbPHP.php',
        'CdbWriter' => 'includes/utils/Cdb.php',
-       'CdbWriterDBA' => 'includes/utils/Cdb.php',
+       'CdbWriterDBA' => 'includes/utils/CdbDBA.php',
        'CdbWriterPHP' => 'includes/utils/CdbPHP.php',
        'ConfEditor' => 'includes/utils/ConfEditor.php',
        'ConfEditorParseError' => 'includes/utils/ConfEditor.php',
@@@ -1165,8 -1166,6 +1166,8 @@@ class AutoLoader 
                // do not strip the leading backlash in this case, causing autoloading to fail.
                $className = ltrim( $className, '\\' );
  
 +              $filename = false;
 +
                if ( isset( $wgAutoloadLocalClasses[$className] ) ) {
                        $filename = $wgAutoloadLocalClasses[$className];
                } elseif ( isset( $wgAutoloadClasses[$className] ) ) {
@@@ -1179,6 -1178,7 +1180,6 @@@
                         * and we are plagued with several legacy uses created by MediaWiki < 1.5, see
                         * https://wikitech.wikimedia.org/wiki/Text_storage_data
                         */
 -                      $filename = false;
                        $lowerClass = strtolower( $className );
  
                        if ( self::$autoloadLocalClassesLower === null ) {