Merge "ContribsPager: Batch page existence lookup for IP range contributions"

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 0b2faec..f741a4e 100644 (file)
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -212,6 +212,7 @@ changes to languages because of Phabricator reports.
 * (T157227) bot_password.bp_user, change_tag.ct_log_id, change_tag.ct_rev_id,
   page_restrictions.pr_user, tag_summary.ts_log_id, tag_summary.ts_rev_id and
   user_properties.up_user have all been made unsigned on MySQL.
+* DB_SLAVE is deprecated. DB_REPLICA should be used instead.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for

diff --git a/includes/Defines.php b/includes/Defines.php
index 8ac84e5..ca603e7 100644 (file)
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -31,6 +31,9 @@ use Wikimedia\Rdbms\IDatabase;
  */
 
 # Obsolete aliases
+/**
+ * @deprecated since 1.28
+ */
 define( 'DB_SLAVE', -1 );
 
 /**@{