diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index ef8a3c3..6da5b71 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -1339,7 +1339,7 @@ class DatabaseConnection {
 			$this->connectDB();
 		}
 		$output = array();
-		$columns_res = $this->link->query('SHOW COLUMNS FROM `' . $tableName . '`');
+		$columns_res = $this->link->query('SHOW FULL COLUMNS FROM `' . $tableName . '`');
 		while ($fieldRow = $columns_res->fetch_assoc()) {
 			$output[$fieldRow['Field']] = $fieldRow;
 		}
diff --git a/typo3/sysext/install/Classes/Sql/SchemaMigrator.php b/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
index 16c04a6..5a1a9a8 100644
--- a/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
+++ b/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
@@ -564,6 +564,9 @@ class SchemaMigrator {
 		if ($row['Extra']) {
 			$field[] = $row['Extra'];
 		}
+		if ($row['Comment']) {
+			$field[] = "COMMENT '" . $row['Comment'] . "'";
+		}
 		return implode(' ', $field);
 	}