Merge "rdbms: deprecate unused aggregateValue() method"

diff --combined includes/libs/rdbms/database/IDatabase.php
index a8d4f1e,3e3eb3a..e25b4d2
--- 1/includes/libs/rdbms/database/IDatabase.php
--- 2/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@@ -113,8 -113,6 +113,8 @@@ interface IDatabase 
         *   permanent as far as write tracking is concerned. This is useful for testing.
         */
        const QUERY_PSEUDO_PERMANENT = 2;
 +      /** @var int Enforce that a query does not make effective writes */
 +      const QUERY_REPLICA_ROLE = 4;
  
        /** @var bool Parameter to unionQueries() for UNION ALL */
        const UNION_ALL = true;
@@@ -1013,6 -1011,7 +1013,7 @@@
         * @param string $valuename
         *
         * @return string
+        * @deprecated Since 1.33
         */
        public function aggregateValue( $valuedata, $valuename = 'value' );
  
@@@ -1556,6 -1555,7 +1557,6 @@@
         *
         * @param callable $callback
         * @param string $fname Caller name
 -       * @return mixed
         * @since 1.28
         */
        public function onTransactionResolution( callable $callback, $fname = __METHOD__ );
@@@ -1599,6 -1599,7 +1600,6 @@@
         *
         * @param callable $callback
         * @param string $fname
 -       * @return mixed
         * @since 1.20
         * @deprecated Since 1.32
         */
@@@ -1644,6 -1645,7 +1645,6 @@@
         *
         * @param string $name Callback name
         * @param callable|null $callback Use null to unset a listener
 -       * @return mixed
         * @since 1.28
         */
        public function setTransactionListener( $name, callable $callback = null );
@@@ -2171,6 -2173,7 +2172,6 @@@
         * the aliases can be removed, and then the old X-named indexes dropped.
         *
         * @param string[] $aliases
 -       * @return mixed
         * @since 1.31
         */
        public function setIndexAliases( array $aliases );