Merge "Move TransactionProfiler to /libs/rdbms"

diff --combined autoload.php
index 66736b3,4b5d9e8..80619d6
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -297,21 -297,21 +297,21 @@@ $wgAutoloadLocalClasses = 
        'CsvStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
        'CurlHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
        'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php',
 -      'DBAccessError' => __DIR__ . '/includes/db/DatabaseError.php',
 +      'DBAccessError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
        'DBAccessObjectUtils' => __DIR__ . '/includes/dao/DBAccessObjectUtils.php',
        'DBConnRef' => __DIR__ . '/includes/db/DBConnRef.php',
 -      'DBConnectionError' => __DIR__ . '/includes/db/DatabaseError.php',
 -      'DBError' => __DIR__ . '/includes/db/DatabaseError.php',
 -      'DBExpectedError' => __DIR__ . '/includes/db/DatabaseError.php',
 +      'DBConnectionError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
 +      'DBError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
 +      'DBExpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
        'DBFileJournal' => __DIR__ . '/includes/filebackend/filejournal/DBFileJournal.php',
        'DBLockManager' => __DIR__ . '/includes/filebackend/lockmanager/DBLockManager.php',
        'DBMasterPos' => __DIR__ . '/includes/db/DatabaseUtility.php',
 -      'DBQueryError' => __DIR__ . '/includes/db/DatabaseError.php',
 -      'DBReadOnlyError' => __DIR__ . '/includes/db/DatabaseError.php',
 -      'DBReplicationWaitError' => __DIR__ . '/includes/db/DatabaseError.php',
 +      'DBQueryError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
 +      'DBReadOnlyError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
 +      'DBReplicationWaitError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
        'DBSiteStore' => __DIR__ . '/includes/site/DBSiteStore.php',
 -      'DBTransactionError' => __DIR__ . '/includes/db/DatabaseError.php',
 -      'DBUnexpectedError' => __DIR__ . '/includes/db/DatabaseError.php',
 +      'DBTransactionError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
 +      'DBUnexpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
        'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
        'Database' => __DIR__ . '/includes/db/Database.php',
        'DatabaseBase' => __DIR__ . '/includes/db/Database.php',
@@@ -575,12 -575,12 +575,12 @@@
        'ICacheHelper' => __DIR__ . '/includes/cache/CacheHelper.php',
        'IContextSource' => __DIR__ . '/includes/context/IContextSource.php',
        'IDBAccessObject' => __DIR__ . '/includes/dao/IDBAccessObject.php',
 -      'IDatabase' => __DIR__ . '/includes/db/IDatabase.php',
 +      'IDatabase' => __DIR__ . '/includes/libs/rdbms/database/IDatabase.php',
        'IEContentAnalyzer' => __DIR__ . '/includes/libs/IEContentAnalyzer.php',
        'IEUrlExtension' => __DIR__ . '/includes/libs/IEUrlExtension.php',
        'IExpiringStore' => __DIR__ . '/includes/libs/objectcache/IExpiringStore.php',
        'IJobSpecification' => __DIR__ . '/includes/jobqueue/JobSpecification.php',
 -      'ILoadBalancer' => __DIR__ . '/includes/db/loadbalancer/ILoadBalancer.php',
 +      'ILoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/ILoadBalancer.php',
        'IP' => __DIR__ . '/includes/utils/IP.php',
        'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
        'IPTC' => __DIR__ . '/includes/media/IPTC.php',
@@@ -767,7 -767,6 +767,7 @@@
        'MWDocGen' => __DIR__ . '/maintenance/mwdocgen.php',
        'MWException' => __DIR__ . '/includes/exception/MWException.php',
        'MWExceptionHandler' => __DIR__ . '/includes/exception/MWExceptionHandler.php',
 +      'MWExceptionRenderer' => __DIR__ . '/includes/exception/MWExceptionRenderer.php',
        'MWGrants' => __DIR__ . '/includes/utils/MWGrants.php',
        'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
        'MWMemcached' => __DIR__ . '/includes/compat/MemcachedClientCompat.php',
@@@ -1420,7 -1419,7 +1420,7 @@@
        'TitleValue' => __DIR__ . '/includes/title/TitleValue.php',
        'TrackBlobs' => __DIR__ . '/maintenance/storage/trackBlobs.php',
        'TraditionalImageGallery' => __DIR__ . '/includes/gallery/TraditionalImageGallery.php',
-       'TransactionProfiler' => __DIR__ . '/includes/profiler/TransactionProfiler.php',
+       'TransactionProfiler' => __DIR__ . '/includes/libs/rdbms/TransactionProfiler.php',
        'TransformParameterError' => __DIR__ . '/includes/media/MediaTransformOutput.php',
        'TransformTooBigImageAreaError' => __DIR__ . '/includes/media/MediaTransformOutput.php',
        'TransformationalImageHandler' => __DIR__ . '/includes/media/TransformationalImageHandler.php',