From c2c10094a81ef64b2db9b9154abe6109133461e6 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Sun, 13 Jun 2021 19:38:16 +0300
Subject: [PATCH] Made main.flush more resilient for parallel threads

---
 mysql-test/main/flush.result | 3 +++
 mysql-test/main/flush.test   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mysql-test/main/flush.result b/mysql-test/main/flush.result
index 54f104430c8..941dc63e3da 100644
--- a/mysql-test/main/flush.result
+++ b/mysql-test/main/flush.result
@@ -608,7 +608,10 @@ disconnect con1;
 #
 # Test FLUSH THREADS
 #
+set @save_thread_cache_size=@@global.thread_cache_size;
+set @@global.thread_cache_size=0;
 flush threads;
 show status like "Threads_cached";
 Variable_name	Value
 Threads_cached	0
+set @@global.thread_cache_size=@save_thread_cache_size;
diff --git a/mysql-test/main/flush.test b/mysql-test/main/flush.test
index 38735641bbf..97830238b0e 100644
--- a/mysql-test/main/flush.test
+++ b/mysql-test/main/flush.test
@@ -727,5 +727,8 @@ disconnect con1;
 --echo # Test FLUSH THREADS
 --echo #
 
+set @save_thread_cache_size=@@global.thread_cache_size;
+set @@global.thread_cache_size=0;
 flush threads;
 show status like "Threads_cached";
+set @@global.thread_cache_size=@save_thread_cache_size;