diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt
index 07a43f8aa87196089c868a0a862b64e1c0956e8e..df80cfbb8fbf9e6d00098ddc5d74c114a677c5e9 100644
--- a/core/CHANGELOG.txt
+++ b/core/CHANGELOG.txt
@@ -129,6 +129,7 @@ Drupal 8.0, xxxx-xx-xx (development version)
     * Added a serialization module using the Symfony serialization component.
     * Added a Hypertext Application Language (HAL) serialization module.
     * Added a HTTP Basic authentication provider module.
+- When using MySQL, the MyISAM engine is no longer supported.
 
 Drupal 7.0, 2011-01-05
 ----------------------
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
index 02c41e678d70c0a46890211b4e8699096170ed84..202d0561ab2c08e0c8436afd565fd6cf1bf5d310 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
@@ -34,6 +34,10 @@ public function __construct() {
         'The %name database server must support utf8mb4 character encoding to work with Drupal. Make sure to use a database server that supports utf8mb4 character encoding, such as MySQL/MariaDB/Percona versions 5.5.3 and up.',
       ),
     );
+    $this->tasks[] = array(
+      'arguments' => array(),
+      'function' => 'ensureInnoDbAvailable',
+    );
   }
 
   /**
@@ -106,4 +110,15 @@ public function getFormOptions(array $database) {
 
     return $form;
   }
+
+  /**
+   * Ensure that InnoDB is available.
+   */
+  function ensureInnoDbAvailable() {
+    $engines = Database::getConnection()->query('SHOW ENGINES')->fetchAllKeyed();
+    if (isset($engines['MyISAM']) && $engines['MyISAM'] == 'DEFAULT' && !isset($engines['InnoDB'])) {
+      $this->fail(t('The MyISAM storage engine is not supported.'));
+    }
+  }
+
 }