diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /kde-apps/akonadi/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'kde-apps/akonadi/files')
3 files changed, 98 insertions, 0 deletions
diff --git a/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch new file mode 100644 index 000000000000..204961832767 --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch @@ -0,0 +1,20 @@ +diff -aruN akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp +--- akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp 2014-08-10 06:38:58.000000000 -0400 ++++ akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp 2015-01-08 15:08:36.906134212 -0500 +@@ -76,6 +76,7 @@ + << QLatin1String( "/usr/local/sbin" ) + << QLatin1String( "/usr/local/libexec" ) + << QLatin1String( "/usr/libexec" ) ++ << QLatin1String( "/usr/share/mysql/scripts" ) + << QLatin1String( "/opt/mysql/libexec" ) + << QLatin1String( "/opt/local/lib/mysql5/bin" ) + << QLatin1String( "/opt/mysql/sbin" ); +@@ -278,7 +279,7 @@ + // first run, some MySQL versions need a mysql_install_db run for that + const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) ); + if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { +- const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); ++ const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=/usr" ) ; + QProcess::execute( mMysqlInstallDbPath, arguments ); + } + diff --git a/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch b/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch new file mode 100644 index 000000000000..a090636e7256 --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch @@ -0,0 +1,38 @@ +From: Daniel Vrátil <dvratil@kde.org> +Date: Tue, 16 Feb 2016 17:26:22 +0000 +Subject: Drop mysql.conf option removed in MySQL 5.7 +X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=9a9f7eaa38023f70c6fa85a87359a487ccf7a48c +--- +Drop mysql.conf option removed in MySQL 5.7 + +innodb_additional_mem_pool_size option has been deprecated in MySQL 5.6 +and removed in 5.7 so MySQL will no longer start it the option is present +in mysql.conf. + +The option still seems to be supported by MariaDB, but the default value +we had in the mysql.conf was below the minimum allowed value, so the harm +in removing the option for MariaDB should be minimal. + +If options supported by MySQL and MariaDB begin to diverge more in the future +we might consider having separate config files for each database. + +* 2016-02-21: Adjusted path for 1.13 branch +--- + + +--- a/server/src/storage/mysql-global.conf ++++ b/server/src/storage/mysql-global.conf +@@ -37,9 +37,9 @@ + # use InnoDB for transactions and better crash recovery + default_storage_engine=innodb + +-# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:1M) +-# Deprecated in MySQL >= 5.6.3 +-innodb_additional_mem_pool_size=1M ++# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:8M) ++# Deprecated in MySQL >= 5.6.3, removed in 5.7 (works in MariaDB) ++# innodb_additional_mem_pool_size=8M + + # memory buffer InnoDB uses to cache data and indexes of its tables (default:128M) + # Larger values means less I/O + diff --git a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch new file mode 100644 index 000000000000..0b5e381b155d --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch @@ -0,0 +1,40 @@ +Gentoo-bug: 530012 + +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index 50421714d..dfae09c20 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings) + << QStringLiteral("/usr/local/sbin") + << QStringLiteral("/usr/local/libexec") + << QStringLiteral("/usr/libexec") ++ << QStringLiteral("/usr/share/mysql/scripts") + << QStringLiteral("/opt/mysql/libexec") + << QStringLiteral("/opt/local/lib/mysql5/bin") + << QStringLiteral("/opt/mysql/sbin"); +@@ -511,7 +512,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt + return 0 == execute(mMysqlInstallDbPath, { + QStringLiteral("--defaults-file=%1").arg(confFile), + QStringLiteral("--force"), +- QStringLiteral("--basedir=%1").arg(baseDir), ++ QStringLiteral("--basedir=/usr"), + QStringLiteral("--datadir=%1/").arg(dataDir) + }); + } +@@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const + return 0 == execute(mMysqldPath, { + QStringLiteral("--defaults-file=%1").arg(confFile), + QStringLiteral("--initialize"), ++ QStringLiteral("--basedir=/usr"), + QStringLiteral("--datadir=%1/").arg(dataDir) + }); + } +@@ -539,7 +541,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri + // Don't use --force, it has been removed in MySQL 5.7.5 + return 0 == execute(mMysqlInstallDbPath, { + QStringLiteral("--defaults-file=%1").arg(confFile), +- QStringLiteral("--basedir=%1").arg(baseDir), ++ QStringLiteral("--basedir=/usr"), + QStringLiteral("--datadir=%1/").arg(dataDir) + }); + } |