MDEV-22933 - remove ---source include/not_threadpool.inc from tests

vaintroub · vaintroub · commit 98333883eef0 · 2020-06-18T23:12:54.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`#`
`9`	`9`
`10`	`10`	`-- source include/not_embedded.inc`
`11`		`--- source include/not_threadpool.inc`
`12`	`11`
`13`	`12`	`--echo #`
`14`	`13`	`--echo # MDEV-6896 kill user command cause MariaDB crash!`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`--source include/not_embedded.inc`
`4`	`4`	`--source include/have_perfschema.inc`
`5`		`---source include/not_threadpool.inc`
`6`	`5`
`7`	`6`	`#`
`8`	`7`	`# Important note:`