From 5c84fe1b81b3094c2aad079ce330b327cb0a0481 Mon Sep 17 00:00:00 2001
From: acsfer <carlos@reendex.com>
Date: Tue, 7 Dec 2021 11:45:54 +0100
Subject: Add MariaDB 10.6 pipeline

Keeping MariaDB 10.4 too as both versions have some BC breaks, so tests will run on both (for now).
---
 .drone.yml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index c01f4188a93..4825a6b1a7f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -360,6 +360,42 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: mariadb10.6-php8.0
+
+steps:
+- name: submodules
+  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
+  commands:
+    - git submodule update --init
+- name: mariadb10.6-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
+
+services:
+- name: cache
+  image: ghcr.io/nextcloud/continuous-integration-redis:latest
+- name: mariadb
+  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6continuous-integration-mariadb-10.6:10.6
+  environment:
+    MYSQL_ROOT_PASSWORD: owncloud
+    MYSQL_USER: oc_autotest
+    MYSQL_PASSWORD: owncloud
+    MYSQL_DATABASE: oc_autotest
+  tmpfs:
+    - /var/lib/mysql
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: mysql8.0-php7.4
-- 
cgit v1.2.3


From 06b77fd6663594db566f1785063dfe2456435251 Mon Sep 17 00:00:00 2001
From: acsfer <carlos@reendex.com>
Date: Tue, 7 Dec 2021 11:58:30 +0100
Subject: Attempt to fix CI

---
 lib/private/DB/ConnectionFactory.php | 1 -
 1 file changed, 1 deletion(-)

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']
 			];
 		}
-- 
cgit v1.2.3


From e49233a79546f36771e31b96e330eedf61b63a34 Mon Sep 17 00:00:00 2001
From: acsfer <carlos@reendex.com>
Date: Tue, 7 Dec 2021 12:44:38 +0100
Subject: Don't convert tables to COMPRESSED

---
 lib/private/Repair/Collation.php | 5 -----
 1 file changed, 5 deletions(-)

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();
-- 
cgit v1.2.3


From 8c27f74a63c6eed61b859016757d0c74a80b044d Mon Sep 17 00:00:00 2001
From: acsfer <carlos@reendex.com>
Date: Tue, 7 Dec 2021 12:48:48 +0100
Subject: Update default row_format

---
 config/config.sample.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 4a28748b69c..68c0a0b44b0 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1562,7 +1562,7 @@ $CONFIG = [
  * Tables will be created with
  *  * character set: utf8mb4
  *  * collation:     utf8mb4_bin
- *  * row_format:    compressed
+ *  * row_format:    dynamic
  *
  * See:
  * https://dev.mysql.com/doc/refman/5.7/en/charset-unicode-utf8mb4.html
-- 
cgit v1.2.3