From 6b7da257afdf7c79d9e8c0e0afe48f0fcb4d218e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Mon, 14 Apr 2014 09:36:18 +0800 Subject: [PATCH] MDL-45070 relax the mariaDB version checker to work with long Ubuntu versions Example of Ubuntu version: 5.5.5-10.0.10-MariaDB-1~saucy-log --- lib/dml/mariadb_native_moodle_database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dml/mariadb_native_moodle_database.php b/lib/dml/mariadb_native_moodle_database.php index cbf5992200f..12dc9ebefff 100644 --- a/lib/dml/mariadb_native_moodle_database.php +++ b/lib/dml/mariadb_native_moodle_database.php @@ -81,7 +81,7 @@ class mariadb_native_moodle_database extends mysqli_native_moodle_database { public function get_server_info() { $version = $this->mysqli->server_info; $matches = null; - if (preg_match('/^5\.5\.5-(10\..+)-MariaDB$/i', $version, $matches)) { + 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]; }