diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-01-19 09:25:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 09:25:46 +0100 |
| commit | eb3cf6c5ec4381a69a623ccd97a91173f799d3a2 (patch) | |
| tree | f02ef5485926045302a96223371569cb9c560920 /lib | |
| parent | deca6117baaca700bd06b02aa6d9647f5b8551f2 (diff) | |
| parent | 8c27f74a63c6eed61b859016757d0c74a80b044d (diff) | |
| download | nextcloud-server-eb3cf6c5ec4381a69a623ccd97a91173f799d3a2.tar.gz nextcloud-server-eb3cf6c5ec4381a69a623ccd97a91173f799d3a2.zip | |
Merge pull request #30129 from nextcloud/mdb10.6-pipeline
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/DB/ConnectionFactory.php | 1 | ||||
| -rw-r--r-- | lib/private/Repair/Collation.php | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php index b4c7597f6d4..e9ed5979894 100644 --- a/lib/private/DB/ConnectionFactory.php +++ b/lib/private/DB/ConnectionFactory.php @@ -228,7 +228,6 @@ class ConnectionFactory { $connectionParams['defaultTableOptions'] = [ 'collate' => 'utf8mb4_bin', 'charset' => 'utf8mb4', - 'row_format' => 'compressed', 'tablePrefix' => $connectionParams['tablePrefix'] ]; } diff --git a/lib/private/Repair/Collation.php b/lib/private/Repair/Collation.php index 01773f7e69f..e949c261b80 100644 --- a/lib/private/Repair/Collation.php +++ b/lib/private/Repair/Collation.php @@ -90,11 +90,6 @@ class Collation implements IRepairStep { } $output->info("Change collation for $table ..."); - if ($characterSet === 'utf8mb4') { - // need to set row compression first - $query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;'); - $query->execute(); - } $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;'); try { $query->execute(); |