35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From 6567fbcae7cbb3331ed93575b7b331d8f2fde23d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Antonio Rojas <arojas@archlinux.org>
|
||
|
|
Date: Fri, 17 Jun 2022 18:28:58 +0200
|
||
|
|
Subject: [PATCH] Don't delete mariadb log files
|
||
|
|
|
||
|
|
The ib_logfile0 file is mandatory in MariaDB 10.8 [1] so akonadi deleting it on upgrade breaks the database self-check and prevents akonadi from working
|
||
|
|
|
||
|
|
[1] https://jira.mariadb.org/browse/MDEV-14425
|
||
|
|
|
||
|
|
BUG: 454948
|
||
|
|
---
|
||
|
|
src/server/storage/dbconfigmysql.cpp | 6 ------
|
||
|
|
1 file changed, 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
|
||
|
|
index 8c5a52628..35fffd865 100644
|
||
|
|
--- a/src/server/storage/dbconfigmysql.cpp
|
||
|
|
+++ b/src/server/storage/dbconfigmysql.cpp
|
||
|
|
@@ -390,12 +390,6 @@ bool DbConfigMysql::startInternalServer()
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate
|
||
|
|
- if (confUpdate) {
|
||
|
|
- QFile(dataDir + QDir::separator() + QLatin1String("ib_logfile0")).remove();
|
||
|
|
- QFile(dataDir + QDir::separator() + QLatin1String("ib_logfile1")).remove();
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
qCDebug(AKONADISERVER_LOG) << "Executing:" << mMysqldPath << arguments.join(QLatin1Char(' '));
|
||
|
|
mDatabaseProcess = new QProcess;
|
||
|
|
mDatabaseProcess->start(mMysqldPath, arguments);
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|