From 466ae1cf81f54b729058357bb19c4cf3982e1367 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sun, 12 May 2024 11:25:32 +0200
Subject: [PATCH] sporadic failures of galera.galera_sst_mariabackup

the test failed almost always in release (but not in debug) builds with

--- galera_sst_mariabackup.result
+++ galera_sst_mariabackup.reject
@@ -5,7 +5,7 @@
 connection node_1;
 select @@innodb_undo_tablespaces;
 @@innodb_undo_tablespaces
-0
+3
 connection node_2;
 select @@innodb_undo_tablespaces;
 @@innodb_undo_tablespaces

and

[Warning] InnoDB: Cannot change innodb_undo_tablespaces=0 because previous shutdown was not with innodb_fast_shutdown=0

because mariadbd *before this test* wasn't using innodb_fast_shutdown=0

Fix the bootstrap to use innodb_fast_shutdown=0 (and the bootstrap
creates a starting point for any test that uses a .cnf file)

followup for cac0fc97cca4

also, remove redundant include/have_innodb.inc
---
 mysql-test/include/galera_cluster.inc                 | 2 --
 mysql-test/include/have_wsrep_enabled.inc             | 2 --
 mysql-test/mariadb-test-run.pl                        | 1 +
 mysql-test/suite/galera/t/galera_sst_mariabackup.test | 1 -
 mysql-test/suite/wsrep/t/pool_of_threads.test         | 1 +
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mysql-test/include/galera_cluster.inc b/mysql-test/include/galera_cluster.inc
index 48b5bc631db..12708bfcc5f 100644
--- a/mysql-test/include/galera_cluster.inc
+++ b/mysql-test/include/galera_cluster.inc
@@ -13,10 +13,8 @@ if (!$galera_cluster_size)
 }
 
 --source include/galera_init.inc
---source include/have_innodb.inc
 --source include/galera_wait_ready.inc
 
-
 --let $_galera_node= $galera_cluster_size
 
 while ($_galera_node != 1)
diff --git a/mysql-test/include/have_wsrep_enabled.inc b/mysql-test/include/have_wsrep_enabled.inc
index 7eb8b4372cf..33ff58b93ab 100644
--- a/mysql-test/include/have_wsrep_enabled.inc
+++ b/mysql-test/include/have_wsrep_enabled.inc
@@ -1,8 +1,6 @@
 # To be used in a test which requires wsrep plugin to be ACTIVE and enabled
 # (i.e. wsrep_on=ON). It includes have_wsrep.inc.
 
---source include/have_innodb.inc
-
 if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'wsrep_on' AND VARIABLE_VALUE='ON'`)
 {
   --skip Test requires wsrep_on=ON
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
index 16a6af9f511..f8fa113e463 100755
--- a/mysql-test/mariadb-test-run.pl
+++ b/mysql-test/mariadb-test-run.pl
@@ -3103,6 +3103,7 @@ sub mysql_install_db {
   # starting from 10.0 bootstrap scripts require InnoDB
   mtr_add_arg($args, "--loose-innodb");
   mtr_add_arg($args, "--loose-innodb-log-file-size=10M");
+  mtr_add_arg($args, "--loose-innodb-fast-shutdown=0");
   mtr_add_arg($args, "--disable-sync-frm");
   mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/");
   mtr_add_arg($args, "--core-file");
diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup.test b/mysql-test/suite/galera/t/galera_sst_mariabackup.test
index 7dead49eb98..96f8b4dca55 100644
--- a/mysql-test/suite/galera/t/galera_sst_mariabackup.test
+++ b/mysql-test/suite/galera/t/galera_sst_mariabackup.test
@@ -1,6 +1,5 @@
 --source include/big_test.inc
 --source include/galera_cluster.inc
---source include/have_innodb.inc
 --source include/have_mariabackup.inc
 
 # Save original auto_increment_offset values.
diff --git a/mysql-test/suite/wsrep/t/pool_of_threads.test b/mysql-test/suite/wsrep/t/pool_of_threads.test
index 8e95d0ca495..f035236da0e 100644
--- a/mysql-test/suite/wsrep/t/pool_of_threads.test
+++ b/mysql-test/suite/wsrep/t/pool_of_threads.test
@@ -1,3 +1,4 @@
+--source include/have_innodb.inc
 --source include/have_wsrep_enabled.inc
 --source include/have_binlog_format_row.inc