Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 59f3ca6201c1487f3a4aceafe2c4a96201e58ce7

 install/lib/mysql.lib.php

@@ -776,7 +776,7 @@
    *
    * @access private
    */
   public function db_result($iResId, $iConnection) {
   public function __construct($iResId, $iConnection) {
      $this->_iResId = $iResId;
      $this->_iConnection = $iConnection;
   }
@@ -902,7 +902,7 @@
    *
    * @access private
    */
   public function fakedb_result($aData) {
   public function __construct($aData) {
      $this->aResultData = $aData;
      $this->aLimitedData = $aData;
      reset($this->aLimitedData);