Merge "RELEASE-NOTES: Increase minimum MySQL version to 5.0.3"

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index a8d99ff..1a0c0d9 100644 (file)
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -409,6 +409,7 @@ changes to languages because of Bugzilla reports.
 * EditPage::attemptSave has been modified not to call handleStatus itself and
   instead just returns the Status object. Extension calling it should be aware of
   this.
+* Removed class DBObject. (unused since 1.10)
 
 == Compatibility ==
 

diff --git a/autoload.php b/autoload.php
index eacf431..892a1f7 100644 (file)
--- a/autoload.php
+++ b/autoload.php
@@ -276,7 +276,6 @@ $wgAutoloadLocalClasses = array(
        'DBFileJournal' => __DIR__ . '/includes/filebackend/filejournal/DBFileJournal.php',
        'DBLockManager' => __DIR__ . '/includes/filebackend/lockmanager/DBLockManager.php',
        'DBMasterPos' => __DIR__ . '/includes/db/DatabaseUtility.php',
-       'DBObject' => __DIR__ . '/includes/db/DatabaseUtility.php',
        'DBQueryError' => __DIR__ . '/includes/db/DatabaseError.php',
        'DBSiteStore' => __DIR__ . '/includes/site/DBSiteStore.php',
        'DBUnexpectedError' => __DIR__ . '/includes/db/DatabaseError.php',

diff --git a/includes/db/DatabaseUtility.php b/includes/db/DatabaseUtility.php
index 4e5ed08..9a520ff 100644 (file)
--- a/includes/db/DatabaseUtility.php
+++ b/includes/db/DatabaseUtility.php
@@ -21,29 +21,6 @@
  * @ingroup Database
  */
 
-/**
- * Utility class.
- * @ingroup Database
- */
-class DBObject {
-       public $mData;
-
-       function __construct( $data ) {
-               $this->mData = $data;
-       }
-
-       /**
-        * @return bool
-        */
-       function isLOB() {
-               return false;
-       }
-
-       function data() {
-               return $this->mData;
-       }
-}
-
 /**
  * Utility class
  * @ingroup Database