Merge "rdbms: make connection counting logic in LoadBalancer less stateful"

[lhc/web/wiklou.git] / includes / libs / rdbms / database / DatabaseMysqli.php

diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php b/includes/libs/rdbms/database/DatabaseMysqli.php
index 937f381..0f444cd 100644 (file)
--- a/includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/includes/libs/rdbms/database/DatabaseMysqli.php
@@ -125,21 +125,6 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                return false;
        }
 
-       protected function connectInitCharset() {
-               // already done in mysqlConnect()
-               return true;
-       }
-
-       /**
-        * @param string $charset
-        * @return bool
-        */
-       protected function mysqlSetCharset( $charset ) {
-               $conn = $this->getBindingHandle();
-
-               return $conn->set_charset( $charset );
-       }
-
        /**
         * @return bool
         */
@@ -203,7 +188,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 
        /**
         * @param mysqli_result $res
-        * @return bool
+        * @return array|false
         */
        protected function mysqlFetchArray( $res ) {
                $array = $res->fetch_array();