From de84057cf0c9dea65a8253e19f9065f6e7f5ca82 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Thu, 8 Aug 2024 23:53:26 +0200
Subject: [PATCH] fix Percona XtraDB 8.0 bootstrap on Debian/Ubuntu

---
 CHANGELOG.md                        | 1 +
 templates/debian_default_my_cnf.epp | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5f107a..b618e85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 * SST package install fails because repo is not yet configured
+* Remove incompatible options from bootstrap workaround on Debian/Ubuntu
 * Fix Percona XtraDB 8.0 package name on Debian/Ubuntu
 * Fix Percona XtraDB 8.0 bootstrap command
 * Fix Percona XtraDB `my.cnf` location on RHEL-based systems
diff --git a/templates/debian_default_my_cnf.epp b/templates/debian_default_my_cnf.epp
index ecc05b5..3ad7b8d 100644
--- a/templates/debian_default_my_cnf.epp
+++ b/templates/debian_default_my_cnf.epp
@@ -34,14 +34,8 @@ myisam_sort_buffer_size	= 512M
 concurrent_insert	= 2
 read_buffer_size	= 2M
 read_rnd_buffer_size	= 1M
-query_cache_limit		= 128K
-query_cache_size		= 64M
-log_warnings		= 2
-slow_query_log_file	= /var/log/mysql/mariadb-slow.log
 long_query_time = 10
 log_slow_verbosity	= query_plan
-log_bin			= /var/log/mysql/mariadb-bin
-log_bin_index		= /var/log/mysql/mariadb-bin.index
 expire_logs_days	= 10
 max_binlog_size         = 100M
 default_storage_engine	= InnoDB
@@ -49,8 +43,6 @@ innodb_buffer_pool_size	= 256M
 innodb_log_buffer_size	= 8M
 innodb_file_per_table	= 1
 innodb_open_files	= 400
-innodb_io_capacity	= 400
-innodb_flush_method	= O_DIRECT
 
 [mysqldump]
 quick