diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-01 03:04:39 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-01 03:04:39 +0000 |
commit | 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch) | |
tree | 844bea44d85dc7218f54970af1c42cc9d55c3f1a /kde-apps/akonadi/files | |
parent | 89c6c06b8c42107dd231687a1012354e7d3039fc (diff) |
gentoo resync : 01.12.2017
Diffstat (limited to 'kde-apps/akonadi/files')
-rw-r--r-- | kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch | 20 | ||||
-rw-r--r-- | kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch | 38 |
2 files changed, 0 insertions, 58 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 deleted file mode 100644 index 204961832767..000000000000 --- a/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index a090636e7256..000000000000 --- a/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - |