Skip to content

Commit 48938c5

Browse files
grooverdangrooverdan
committed
MDEV-25894: support AIX as a platform in mtr
Add fixed for tests mysqld--help,aix.rdiff and sysvars_server_notembedded,aix.rdiff AIX couldn't compile in embedded mode so leaving sysvars_server_embedded for later (if required).
1 parent 2c6d5c9 commit 48938c5

File tree

6 files changed

+125
-2
lines changed

6 files changed

+125
-2
lines changed

‎mysql-test/include/platform.combinations‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
[win]
22

3+
[aix]
4+
35
[unix]
46

‎mysql-test/lib/My/Platform.pm‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use File::Basename;
2222
use File::Path;
2323

2424
use base qw(Exporter);
25-
our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL
25+
our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL IS_AIX
2626
native_path posix_path mixed_path
2727
check_socket_path_length process_alive open_for_append);
2828

@@ -54,6 +54,15 @@ BEGIN {
5454
}
5555
}
5656

57+
BEGIN {
58+
if ($^O eq "aix") {
59+
eval 'sub IS_AIX { 1 }';
60+
}
61+
else {
62+
eval 'sub IS_AIX { 0 }';
63+
}
64+
}
65+
5766

5867
#
5968
# native_path

‎mysql-test/main/mysqld--help,aix.rdiff‎

Whitespace-only changes.

‎mysql-test/suite.pm‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ sub skip_combinations {
1717
unless $ENV{DEBUG_KEY_MANAGEMENT_SO};
1818

1919
# don't run tests for the wrong platform
20-
$skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ];
20+
if (IS_WINDOWS) {
21+
$skip{'include/platform.combinations'} = [ 'aix', 'unix' ];
22+
} elsif (IS_AIX) {
23+
$skip{'include/platform.combinations'} = [ 'win', 'unix' ];
24+
} else {
25+
$skip{'include/platform.combinations'} = [ 'aix', 'win' ];
26+
}
2127

2228
$skip{'include/maybe_debug.combinations'} =
2329
[ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ];

‎mysql-test/suite/sys_vars/inc/sysvars_server.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
--source include/have_perfschema.inc
22
--source include/word_size.inc
3+
--source include/platform.inc
34
--vertical_results
45

56
# need stable timestamp, because its current value is printed below

‎mysql-test/suite/sys_vars/r/sysvars_server_notembedded,aix.rdiff‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
2+
index bb3378139f2..ddab28508ec 100644
3+
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
4+
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
5+
@@ -4259,99 +4259,9 @@ VARIABLE_COMMENT Define threads usage for handling queries
6+
NUMERIC_MIN_VALUE NULL
7+
NUMERIC_MAX_VALUE NULL
8+
NUMERIC_BLOCK_SIZE NULL
9+
-ENUM_VALUE_LIST one-thread-per-connection,no-threads,pool-of-threads
10+
+ENUM_VALUE_LIST one-thread-per-connection,no-threads
11+
READ_ONLY YES
12+
COMMAND_LINE_ARGUMENT REQUIRED
13+
-VARIABLE_NAME THREAD_POOL_DEDICATED_LISTENER
14+
-VARIABLE_SCOPE GLOBAL
15+
-VARIABLE_TYPE BOOLEAN
16+
-VARIABLE_COMMENT If set to 1,listener thread will not pick up queries
17+
-NUMERIC_MIN_VALUE NULL
18+
-NUMERIC_MAX_VALUE NULL
19+
-NUMERIC_BLOCK_SIZE NULL
20+
-ENUM_VALUE_LIST OFF,ON
21+
-READ_ONLY NO
22+
-COMMAND_LINE_ARGUMENT OPTIONAL
23+
-VARIABLE_NAME THREAD_POOL_EXACT_STATS
24+
-VARIABLE_SCOPE GLOBAL
25+
-VARIABLE_TYPE BOOLEAN
26+
-VARIABLE_COMMENT If set to 1, provides better statistics in information_schema threadpool tables
27+
-NUMERIC_MIN_VALUE NULL
28+
-NUMERIC_MAX_VALUE NULL
29+
-NUMERIC_BLOCK_SIZE NULL
30+
-ENUM_VALUE_LIST OFF,ON
31+
-READ_ONLY NO
32+
-COMMAND_LINE_ARGUMENT OPTIONAL
33+
-VARIABLE_NAME THREAD_POOL_IDLE_TIMEOUT
34+
-VARIABLE_SCOPE GLOBAL
35+
-VARIABLE_TYPE INT UNSIGNED
36+
-VARIABLE_COMMENT Timeout in seconds for an idle thread in the thread pool.Worker thread will be shut down after timeout
37+
-NUMERIC_MIN_VALUE 1
38+
-NUMERIC_MAX_VALUE 4294967295
39+
-NUMERIC_BLOCK_SIZE 1
40+
-ENUM_VALUE_LIST NULL
41+
-READ_ONLY NO
42+
-COMMAND_LINE_ARGUMENT REQUIRED
43+
-VARIABLE_NAME THREAD_POOL_MAX_THREADS
44+
-VARIABLE_SCOPE GLOBAL
45+
-VARIABLE_TYPE INT UNSIGNED
46+
-VARIABLE_COMMENT Maximum allowed number of worker threads in the thread pool
47+
-NUMERIC_MIN_VALUE 1
48+
-NUMERIC_MAX_VALUE 65536
49+
-NUMERIC_BLOCK_SIZE 1
50+
-ENUM_VALUE_LIST NULL
51+
-READ_ONLY NO
52+
-COMMAND_LINE_ARGUMENT REQUIRED
53+
-VARIABLE_NAME THREAD_POOL_OVERSUBSCRIBE
54+
-VARIABLE_SCOPE GLOBAL
55+
-VARIABLE_TYPE INT UNSIGNED
56+
-VARIABLE_COMMENT How many additional active worker threads in a group are allowed.
57+
-NUMERIC_MIN_VALUE 1
58+
-NUMERIC_MAX_VALUE 1000
59+
-NUMERIC_BLOCK_SIZE 1
60+
-ENUM_VALUE_LIST NULL
61+
-READ_ONLY NO
62+
-COMMAND_LINE_ARGUMENT REQUIRED
63+
-VARIABLE_NAME THREAD_POOL_PRIORITY
64+
-VARIABLE_SCOPE SESSION
65+
-VARIABLE_TYPE ENUM
66+
-VARIABLE_COMMENT Threadpool priority. High priority connections usually start executing earlier than low priority.If priority set to 'auto', the the actual priority(low or high) is determined based on whether or not connection is inside transaction.
67+
-NUMERIC_MIN_VALUE NULL
68+
-NUMERIC_MAX_VALUE NULL
69+
-NUMERIC_BLOCK_SIZE NULL
70+
-ENUM_VALUE_LIST high,low,auto
71+
-READ_ONLY NO
72+
-COMMAND_LINE_ARGUMENT REQUIRED
73+
-VARIABLE_NAME THREAD_POOL_PRIO_KICKUP_TIMER
74+
-VARIABLE_SCOPE GLOBAL
75+
-VARIABLE_TYPE INT UNSIGNED
76+
-VARIABLE_COMMENT The number of milliseconds before a dequeued low-priority statement is moved to the high-priority queue
77+
-NUMERIC_MIN_VALUE 0
78+
-NUMERIC_MAX_VALUE 4294967295
79+
-NUMERIC_BLOCK_SIZE 1
80+
-ENUM_VALUE_LIST NULL
81+
-READ_ONLY NO
82+
-COMMAND_LINE_ARGUMENT REQUIRED
83+
-VARIABLE_NAME THREAD_POOL_SIZE
84+
-VARIABLE_SCOPE GLOBAL
85+
-VARIABLE_TYPE INT UNSIGNED
86+
-VARIABLE_COMMENT Number of thread groups in the pool. This parameter is roughly equivalent to maximum number of concurrently executing threads (threads in a waiting state do not count as executing).
87+
-NUMERIC_MIN_VALUE 1
88+
-NUMERIC_MAX_VALUE 100000
89+
-NUMERIC_BLOCK_SIZE 1
90+
-ENUM_VALUE_LIST NULL
91+
-READ_ONLY NO
92+
-COMMAND_LINE_ARGUMENT REQUIRED
93+
-VARIABLE_NAME THREAD_POOL_STALL_LIMIT
94+
-VARIABLE_SCOPE GLOBAL
95+
-VARIABLE_TYPE INT UNSIGNED
96+
-VARIABLE_COMMENT Maximum query execution time in milliseconds,before an executing non-yielding thread is considered stalled.If a worker thread is stalled, additional worker thread may be created to handle remaining clients.
97+
-NUMERIC_MIN_VALUE 1
98+
-NUMERIC_MAX_VALUE 4294967295
99+
-NUMERIC_BLOCK_SIZE 1
100+
-ENUM_VALUE_LIST NULL
101+
-READ_ONLY NO
102+
-COMMAND_LINE_ARGUMENT REQUIRED
103+
VARIABLE_NAME THREAD_STACK
104+
VARIABLE_SCOPE GLOBAL
105+
VARIABLE_TYPE BIGINT UNSIGNED

0 commit comments

Comments
 (0)