13 files changed, 0 insertions, 22 deletions
diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test
index dc0ad5cff59..9389c8bc43c 100644
--- a/mysql-test/main/information_schema.test
+++ b/mysql-test/main/information_schema.test
@@ -1,9 +1,6 @@
 # This test  uses grants, which can't get tested for embedded server
 -- source include/not_embedded.inc
 
-#Don't run this test when thread_pool active
---source include/not_threadpool.inc
-
 # check that CSV engine was compiled in, as the result of the test depends
 # on the presence of the log tables (which are CSV-based).
 --source include/have_csv.inc
diff --git a/mysql-test/main/information_schema_db.test b/mysql-test/main/information_schema_db.test
index b244662a28c..7cf8c0801e6 100644
--- a/mysql-test/main/information_schema_db.test
+++ b/mysql-test/main/information_schema_db.test
@@ -2,9 +2,6 @@
 # in the embedded server by default). So skip the test in embedded-server mode.
 -- source include/not_embedded.inc
 
-#Don't run this test when thread_pool active
---source include/not_threadpool.inc
-
 -- source include/testdb_only.inc
 
 set local sql_mode="";
diff --git a/mysql-test/main/kill-2.test b/mysql-test/main/kill-2.test
index 0c1177722b4..3412e75b8d5 100644
--- a/mysql-test/main/kill-2.test
+++ b/mysql-test/main/kill-2.test
@@ -8,7 +8,6 @@
 #
 
 -- source include/not_embedded.inc
--- source include/not_threadpool.inc
 
 --echo #
 --echo # MDEV-6896 kill user command cause MariaDB crash!
diff --git a/mysql-test/main/kill.test b/mysql-test/main/kill.test
index 45d672aebc1..728b6b964e2 100644
--- a/mysql-test/main/kill.test
+++ b/mysql-test/main/kill.test
@@ -9,7 +9,6 @@
 
 -- source include/not_embedded.inc
 -- source include/have_debug_sync.inc
--- source include/not_threadpool.inc
 set local sql_mode="";
 set global sql_mode="";
 
diff --git a/mysql-test/main/mysqlshow.test b/mysql-test/main/mysqlshow.test
index 8c60b64a5f1..7201579452e 100644
--- a/mysql-test/main/mysqlshow.test
+++ b/mysql-test/main/mysqlshow.test
@@ -1,7 +1,5 @@
 # Can't run test of external client with embedded server
 -- source include/not_embedded.inc
-# Don't test when thread_pool active
---source include/not_threadpool.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2,test1,test2;
diff --git a/mysql-test/main/named_pipe.test b/mysql-test/main/named_pipe.test
index 8503907b808..8e0136d06a9 100644
--- a/mysql-test/main/named_pipe.test
+++ b/mysql-test/main/named_pipe.test
@@ -5,9 +5,6 @@
 # Named pipe does not support the non-blocking API.
 --disable_non_blocking_api
 
-# thread pool causes different results
--- source include/not_threadpool.inc
-
 # Only run this test if named pipe is avaliable
 let $nmp= query_get_value("SHOW VARIABLES LIKE 'named_pipe'", Value, 1);
 if ($nmp != ON){
diff --git a/mysql-test/main/status_bug17954.test b/mysql-test/main/status_bug17954.test
index 36430cceeff..75c9ab27dfd 100644
--- a/mysql-test/main/status_bug17954.test
+++ b/mysql-test/main/status_bug17954.test
@@ -4,9 +4,6 @@
 # embedded server causes different stat
 -- source include/not_embedded.inc
 
-# thread pool causes different results
--- source include/not_threadpool.inc
-
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
 
diff --git a/mysql-test/suite/perfschema/t/no_threads.test b/mysql-test/suite/perfschema/t/no_threads.test
index 3cf9a9e3126..b7b8767f1cc 100644
--- a/mysql-test/suite/perfschema/t/no_threads.test
+++ b/mysql-test/suite/perfschema/t/no_threads.test
@@ -2,7 +2,6 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
---source include/not_threadpool.inc
 
 
 # Setup : in this main thread
diff --git a/mysql-test/suite/perfschema/t/one_thread_per_con.test b/mysql-test/suite/perfschema/t/one_thread_per_con.test
index 7a66cd2088f..11a203a12e5 100644
--- a/mysql-test/suite/perfschema/t/one_thread_per_con.test
+++ b/mysql-test/suite/perfschema/t/one_thread_per_con.test
@@ -2,7 +2,6 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
---source include/not_threadpool.inc
 
 # Setup
 
diff --git a/mysql-test/suite/perfschema/t/thread_cache.test b/mysql-test/suite/perfschema/t/thread_cache.test
index 90823988f8c..92309bb9ca1 100644
--- a/mysql-test/suite/perfschema/t/thread_cache.test
+++ b/mysql-test/suite/perfschema/t/thread_cache.test
@@ -2,7 +2,6 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
---source include/not_threadpool.inc
 
 #
 # Important note:
diff --git a/mysql-test/suite/sys_vars/t/all_vars.test b/mysql-test/suite/sys_vars/t/all_vars.test
index c0127e1ef12..06edc04d25c 100644
--- a/mysql-test/suite/sys_vars/t/all_vars.test
+++ b/mysql-test/suite/sys_vars/t/all_vars.test
@@ -1,5 +1,4 @@
 --source include/not_embedded.inc
---source include/not_threadpool.inc
 
 #
 # load everything we want to include in the testing
diff --git a/mysql-test/suite/sys_vars/t/wait_timeout_func.test b/mysql-test/suite/sys_vars/t/wait_timeout_func.test
index ee129b147dd..d388fc9f263 100644
--- a/mysql-test/suite/sys_vars/t/wait_timeout_func.test
+++ b/mysql-test/suite/sys_vars/t/wait_timeout_func.test
@@ -22,7 +22,6 @@
 ###############################################################################
 
 --source include/not_embedded.inc
---source include/not_threadpool.inc
 
 SET @start_value= @@global.wait_timeout;
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/all_vars.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/all_vars.test
index fc700357155..7943d3e4c0b 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/all_vars.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/all_vars.test
@@ -1,6 +1,5 @@
 --source include/have_rocksdb.inc
 --source include/not_embedded.inc
---source include/not_threadpool.inc
 
 # This test verifies that *all* MyRocks system variables are tested by the
 # rocksdb_sys_vars suite. For every MyRocks system variable there must be a