From: Marina Glancy <marina@moodle.com>
Date: Mon, 2 Nov 2015 09:52:59 +0000 (+0800)
Subject: MDL-50633 dml: deprecated var replaced in mysql 5.7
X-Git-Tag: v3.0.0-rc1~11^2
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=57ee89569a0ff2da693296b9c03b0d3730e4e794;hp=-c;ds=inline

MDL-50633 dml: deprecated var replaced in mysql 5.7

Thanks to Charles Verge for providing a patch
---

57ee89569a0ff2da693296b9c03b0d3730e4e794
diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index 70e8a6ed4bc..1874481d5f2 100644
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -180,13 +180,13 @@ class mysqli_native_moodle_database extends moodle_database {
             return $engine;
         }
 
-        // get the default database engine
-        $sql = "SELECT @@storage_engine";
+        // Get the default database engine.
+        $sql = "SELECT @@default_storage_engine engine";
         $this->query_start($sql, NULL, SQL_QUERY_AUX);
         $result = $this->mysqli->query($sql);
         $this->query_end($result);
         if ($rec = $result->fetch_assoc()) {
-            $engine = $rec['@@storage_engine'];
+            $engine = $rec['engine'];
         }
         $result->close();