Merge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle

lib/dml/mariadb_native_moodle_database.php

@@ -74,6 +74,20 @@ class mariadb_native_moodle_database extends mysqli_native_moodle_database {
         return 'mariadb';
     }
 
+    /**
+     * Returns database server info array
+     * @return array Array containing 'description' and 'version' info
+     */
+    public function get_server_info() {
+        $version = $this->mysqli->server_info;
+        $matches = null;
+        if (preg_match('/^5\.5\.5-(10\..+)-MariaDB$/i', $version, $matches)) {
+            // Looks like MariaDB decided to use these weird version numbers for better BC with MySQL...
+            $version = $matches[1];
+        }
+        return array('description'=>$this->mysqli->server_info, 'version'=>$version);
+    }
+
     /**
      * It is time to require transactions everywhere.
      *

lib/environmentlib.php

@@ -984,7 +984,7 @@ function environment_check_database($version, $env_select) {
     $result->setLevel($level);
     $result->setCurrentVersion($current_version);
     $result->setNeededVersion($needed_version);
-    $result->setInfo($current_vendor);
+    $result->setInfo($current_vendor . ' (' . $dbinfo['description'] . ')');
 
 /// Do any actions defined in the XML file.
     process_environment_result($vendorsxml[$current_vendor], $result);