1 files changed, 6 insertions, 4 deletions
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc
index aa0905a35..ff380ba9d 100644
--- a/includes/database/mysql/schema.inc
+++ b/includes/database/mysql/schema.inc
@@ -59,9 +59,11 @@ class DatabaseSchema_mysql extends DatabaseSchema {
    *   An array of SQL statements to create the table.
    */
   protected function createTableSql($name, $table) {
-    if (empty($table['mysql_suffix'])) {
-      $table['mysql_suffix'] = 'DEFAULT CHARACTER SET UTF8';
-    }
+    // Provide some defaults if needed
+    $table += array(
+      'mysql_engine' => 'InnoDB',
+      'mysql_character_set' => 'UTF8',
+    );
 
     $sql = "CREATE TABLE {" . $name . "} (\n";
 
@@ -79,7 +81,7 @@ class DatabaseSchema_mysql extends DatabaseSchema {
     // Remove the last comma and space.
     $sql = substr($sql, 0, -3) . "\n) ";
 
-    $sql .= $table['mysql_suffix'];
+    $sql .= 'ENGINE = ' . $table['mysql_engine'] . ' DEFAULT CHARACTER SET ' . $table['mysql_character_set'];
 
     // Add table comment.
     if (!empty($table['description'])) {