In Database::getLag(): Add some more I/O thread states.

[lhc/web/wiklou.git] / includes / db / DatabaseMssql.php

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index b470690..9521a1a 100644 (file)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -707,13 +707,6 @@ class DatabaseMssql extends DatabaseBase {
                return str_replace("'","''",$s);
        }
 
-       /**
-        * USE INDEX clause
-        */
-       function useIndexClause( $index ) {
-               return "";
-       }
-
        /**
         * REPLACE query wrapper
         * PostgreSQL simulates this with a DELETE followed by INSERT
@@ -857,18 +850,6 @@ class DatabaseMssql extends DatabaseBase {
                return $sql;
        }
 
-       /**
-        * Returns an SQL expression for a simple conditional.
-        *
-        * @param $cond String: SQL expression which will result in a boolean value
-        * @param $trueVal String: SQL expression to return if true
-        * @param $falseVal String: SQL expression to return if false
-        * @return string SQL fragment
-        */
-       function conditional( $cond, $trueVal, $falseVal ) {
-               return " (CASE WHEN $cond THEN $trueVal ELSE $falseVal END) ";
-       }
-
        /**
         * Should determine if the last failure was due to a deadlock
         * @return bool
@@ -918,6 +899,13 @@ class DatabaseMssql extends DatabaseBase {
                return "[http://www.microsoft.com/sql/default.mspx Microsoft SQL Server 2005 Home]";
        }
 
+       /**
+        * @return String: Database type for use in messages
+       */
+       function getDBtypeForMsg() {
+               return 'Microsoft SQL Server';
+       }
+
        /**
         * @return string Version information from the database
         */
@@ -930,11 +918,6 @@ class DatabaseMssql extends DatabaseBase {
                return $sql;
        }
 
-       /**
-        * not done
-        */
-       public function setTimeout($timeout) { return; }
-
        /**
         * How lagged is this slave?
         */
@@ -996,22 +979,9 @@ class DatabaseMssql extends DatabaseBase {
                }
        }
        
-       /** 
-        * No-op lock functions
-        */
-       public function lock( $lockName, $method ) {
-               return true;
-       }
-       public function unlock( $lockName, $method ) {
-               return true;
-       }
-       
        public function getSearchEngine() {
                return "SearchEngineDummy";
        }
-
-       /** No-op */
-       public function setBigSelects( $value = true ) {}
 }
 
 /**