Change the row-format before changing the collation

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/Repair/Collation.php b/lib/private/Repair/Collation.php
index 54de1a719bd2289b51bb35c93b78699a703d016e..a3535fb33a296969ef91917feb08da8eab4e3cb8 100644 (file)
--- a/lib/private/Repair/Collation.php
+++ b/lib/private/Repair/Collation.php
@@ -75,6 +75,18 @@ class Collation implements IRepairStep {
 
                $tables = $this->getAllNonUTF8BinTables($this->connection);
                foreach ($tables as $table) {
+                       $output->info("Change row format for $table ...");
+                       $query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT = DYNAMIC;');
+                       try {
+                               $query->execute();
+                       } catch (DriverException $e) {
+                               // Just log this
+                               $this->logger->logException($e);
+                               if (!$this->ignoreFailures) {
+                                       throw $e;
+                               }
+                       }
+
                        $output->info("Change collation for $table ...");
                        $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
                        try {