summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2021-07-06 15:50:58 +1000
committerDaniel Black <daniel@mariadb.org>2021-07-06 15:50:58 +1000
commitf84b3b88070f83ddfde05b9e6c6b72664dd3372e (patch)
tree9e142e4070059c9cf538886412a84e513b1f04a1
parenta8136d13b2a4226f731f2f024e8199ca40133962 (diff)
downloadmariadb-git-f84b3b88070f83ddfde05b9e6c6b72664dd3372e.tar.gz
mtr: aix has no thread_pool
-rw-r--r--mysql-test/include/have_pool_of_threads.inc3
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_min_threads_basic.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_basic.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test1
10 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/include/have_pool_of_threads.inc b/mysql-test/include/have_pool_of_threads.inc
index 432c6216804..62460127d88 100644
--- a/mysql-test/include/have_pool_of_threads.inc
+++ b/mysql-test/include/have_pool_of_threads.inc
@@ -1,4 +1,5 @@
--- require include/have_pool_of_threads.require
+--source include/not_aix.inc
+--require include/have_pool_of_threads.require
disable_query_log;
show variables like 'thread_handling';
enable_query_log;
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test b/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test
index 4afcc0379f0..b06a5069514 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test
@@ -1,6 +1,7 @@
# uint global
--source include/not_windows.inc
--source include/not_embedded.inc
+--source include/not_aix.inc
SET @start_global_value = @@global.thread_pool_idle_timeout;
#
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test b/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test
index 71b007bde23..8f5f2491e12 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test
@@ -1,5 +1,6 @@
--source include/not_windows.inc
--source include/not_embedded.inc
+--source include/not_aix.inc
SET @global=@@global.thread_pool_idle_timeout;
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test b/mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test
index 3d5cd5f5198..392dbd3a145 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test
@@ -1,5 +1,6 @@
# uint global
--source include/not_embedded.inc
+--source include/not_aix.inc
SET @start_global_value = @@global.thread_pool_max_threads;
#
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test b/mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test
index 29a9ac42ea0..299d5ff4f44 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test
@@ -1,5 +1,6 @@
# uint global
--source include/not_embedded.inc
+--source include/not_aix.inc
SET @global=@@global.thread_pool_max_threads;
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_min_threads_basic.test b/mysql-test/suite/sys_vars/t/thread_pool_min_threads_basic.test
index 131fbe98502..1447c83d39c 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_min_threads_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_min_threads_basic.test
@@ -1,6 +1,7 @@
# uint global
--source include/not_embedded.inc
--source include/windows.inc
+--source include/not_aix.inc
SET @start_global_value = @@global.thread_pool_min_threads;
#
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_basic.test b/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_basic.test
index 74f0f5e6ea7..43817febafd 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_basic.test
@@ -1,6 +1,7 @@
# uint global
--source include/not_windows.inc
--source include/not_embedded.inc
+--source include/not_aix.inc
SET @start_global_value = @@global.thread_pool_oversubscribe;
#
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test b/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test
index cbffb94c297..f3a96c69e8a 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test
@@ -1,5 +1,6 @@
--source include/not_windows.inc
--source include/not_embedded.inc
+--source include/not_aix.inc
SET @global=@@global.thread_pool_oversubscribe;
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test b/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
index 1ab27907535..2d1dc59476c 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
@@ -1,5 +1,6 @@
# uint global
--source include/not_embedded.inc
+--source include/not_aix.inc
SET @start_global_value = @@global.thread_pool_stall_limit;
#
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test b/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test
index 8c0908fe2c0..ae0ed8a785b 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test
@@ -1,5 +1,6 @@
# uint global
--source include/not_embedded.inc
+--source include/not_aix.inc
SET @global=@@global.thread_pool_stall_limit;