diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 599a145e..62d16ed2 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -429,7 +429,7 @@ if (!defined("DRIVER")) {
 		global $connection;
 		$return = array();
 		foreach (get_rows($fast && $connection->server_info >= 5
-			? "SELECT TABLE_NAME AS Name, Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
+			? "SELECT TABLE_NAME AS Name, ENGINE AS Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
 			: "SHOW TABLE STATUS" . ($name != "" ? " LIKE " . q(addcslashes($name, "%_\\")) : "")
 		) as $row) {
 			if ($row["Engine"] == "InnoDB") {
diff --git a/changes.txt b/changes.txt
index afb4d0d7..24d6f320 100644
--- a/changes.txt
+++ b/changes.txt
@@ -4,6 +4,7 @@ Make maxlength in edit fields a soft limit
 Add Cache-Control: immutable to static files
 MySQL: Add dedicated view for replication status
 MySQL: Support spatial indexes
+MySQL: Support MySQL 8
 PostgreSQL: Export
 PostgreSQL: Don't treat partial indexes as unique
 MS SQL: Support pdo_dblib