Skip to content

Commit deb3655

Browse files
grooverdanan3l
authored andcommitted
MDEV-23386: mtr: main.mysqld--help autosized table{-open,}-cach and max-connections
Example of the failure: http://buildbot.askmonty.org/buildbot/builders/bld-p9-rhel7/builds/4417/steps/mtr/logs/stdio ``` main.mysqld--help 'unix' w17 [ fail ] Test ended at 2020-06-20 18:51:45 CURRENT_TEST: main.mysqld--help --- /opt/buildbot-slave/bld-p9-rhel7/build/mysql-test/main/mysqld--help.result 2020-06-20 16:06:49.903604179 +0300 +++ /opt/buildbot-slave/bld-p9-rhel7/build/mysql-test/main/mysqld--help.reject 2020-06-20 18:51:44.886766820 +0300 @@ -1797,10 +1797,10 @@ sync-relay-log-info 10000 sysdate-is-now FALSE system-versioning-alter-history ERROR -table-cache 421 +table-cache 2000 table-definition-cache 400 -table-open-cache 421 -table-open-cache-instances 1 +table-open-cache 2000 +table-open-cache-instances 8 tc-heuristic-recover OFF tcp-keepalive-interval 0 tcp-keepalive-probes 0 mysqltest: Result length mismatch ``` mtr: table_open_cache_basic autosized: Lets assume that >400 are available and that we can set the result back to the start value. All of these system variables are autosized and can generate MTR output differences. Closes #1527
1 parent 85bd531 commit deb3655

File tree

5 files changed

+22
-31
lines changed

5 files changed

+22
-31
lines changed

mysql-test/r/mysqld--help,win.rdiff

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
--- mysqld--help.result
22
+++ mysqld--help,win.reject
3-
@@ -333,7 +333,6 @@
3+
@@ -337,7 +337,6 @@ The following specify which files/extra groups are read (specified before remain
44
The number of segments in a key cache
55
-L, --language=name Client error messages in given language. May be given as
66
a full path. Deprecated. Use --lc-messages-dir instead.
77
- --large-pages Enable support for large pages
88
--lc-messages=name Set the language used for the error messages.
99
-L, --lc-messages-dir=name
1010
Directory where error messages are
11-
@@ -533,6 +532,7 @@
11+
@@ -537,6 +536,7 @@ The following specify which files/extra groups are read (specified before remain
1212
Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
1313
DATETIME, TIMESTAMP columns.
1414
(Defaults to on; use --skip-mysql56-temporal-format to disable.)
1515
+ --named-pipe Enable the named pipe (NT)
1616
--net-buffer-length=#
1717
Buffer length for TCP/IP and socket communication
1818
--net-read-timeout=#
19-
@@ -924,6 +924,9 @@
19+
@@ -928,6 +928,9 @@ The following specify which files/extra groups are read (specified before remain
2020
files within specified directory
2121
--server-id=# Uniquely identifies the server instance in the community
2222
of replication partners
@@ -26,7 +26,7 @@
2626
--show-slave-auth-info
2727
Show user and password in SHOW SLAVE HOSTS on this
2828
master.
29-
@@ -1034,6 +1037,10 @@
29+
@@ -1038,6 +1041,10 @@ The following specify which files/extra groups are read (specified before remain
3030
Log slow queries to given log file. Defaults logging to
3131
'hostname'-slow.log. Must be enabled to activate other
3232
slow log options
@@ -37,15 +37,15 @@
3737
--socket=name Socket file to use for connection
3838
--sort-buffer-size=#
3939
Each thread that needs to do a sort allocates a buffer of
40-
@@ -1052,6 +1059,7 @@
40+
@@ -1056,6 +1063,7 @@ The following specify which files/extra groups are read (specified before remain
4141
NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH
4242
--stack-trace Print a symbolic stack trace on failure
4343
(Defaults to on; use --skip-stack-trace to disable.)
4444
+ --standalone Dummy option to start as a standalone program (NT).
4545
--stored-program-cache=#
4646
The soft upper limit for number of cached stored routines
4747
for one connection.
48-
@@ -1088,25 +1096,11 @@
48+
@@ -1092,25 +1100,11 @@ The following specify which files/extra groups are read (specified before remain
4949
COMMIT, ROLLBACK
5050
--thread-cache-size=#
5151
How many threads we should keep in a cache for reuse
@@ -73,7 +73,7 @@
7373
--thread-stack=# The stack size for each thread
7474
--time-format=name The TIME format (ignored)
7575
--timed-mutexes Specify whether to time mutexes. Deprecated, has no
76-
@@ -1115,8 +1109,8 @@
76+
@@ -1119,8 +1113,8 @@ The following specify which files/extra groups are read (specified before remain
7777
size, MariaDB will automatically convert it to an on-disk
7878
MyISAM or Aria table.
7979
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
@@ -84,23 +84,23 @@
8484
--transaction-alloc-block-size=#
8585
Allocation block size for transactions to be stored in
8686
binary log
87-
@@ -1240,7 +1234,6 @@
87+
@@ -1244,7 +1238,6 @@ key-cache-block-size 1024
8888
key-cache-division-limit 100
8989
key-cache-file-hash-size 512
9090
key-cache-segments 0
9191
-large-pages FALSE
9292
lc-messages en_US
9393
lc-messages-dir MYSQL_SHAREDIR/
9494
lc-time-names en_US
95-
@@ -1307,6 +1300,7 @@
95+
@@ -1310,6 +1303,7 @@ myisam-sort-buffer-size 134216704
9696
myisam-stats-method NULLS_UNEQUAL
9797
myisam-use-mmap FALSE
9898
mysql56-temporal-format TRUE
9999
+named-pipe FALSE
100100
net-buffer-length 16384
101101
net-read-timeout 30
102102
net-retry-count 10
103-
@@ -1403,6 +1397,8 @@
103+
@@ -1406,6 +1400,8 @@ safe-user-create FALSE
104104
secure-auth TRUE
105105
secure-file-priv (No default value)
106106
server-id 0
@@ -109,23 +109,16 @@
109109
show-slave-auth-info FALSE
110110
silent-startup FALSE
111111
skip-grant-tables TRUE
112-
@@ -1426,6 +1422,7 @@
112+
@@ -1429,6 +1425,7 @@ slave-transaction-retries 10
113113
slave-type-conversions
114114
slow-launch-time 2
115115
slow-query-log FALSE
116116
+slow-start-timeout 15000
117117
sort-buffer-size 2097152
118118
sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
119119
stack-trace TRUE
120-
@@ -1438,15 +1435,13 @@
121-
sync-relay-log 10000
122-
sync-relay-log-info 10000
123-
sysdate-is-now FALSE
124-
-table-cache 421
125-
+table-cache 2000
120+
@@ -1444,10 +1441,8 @@ sysdate-is-now FALSE
126121
table-definition-cache 400
127-
-table-open-cache 421
128-
+table-open-cache 2000
129122
tc-heuristic-recover OFF
130123
thread-cache-size 0
131124
-thread-pool-idle-timeout 60

mysql-test/r/mysqld--help.result

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,6 @@ max-binlog-cache-size 18446744073709547520
12771277
max-binlog-size 1073741824
12781278
max-binlog-stmt-cache-size 18446744073709547520
12791279
max-connect-errors 100
1280-
max-connections 151
12811280
max-delayed-threads 20
12821281
max-digest-length 1024
12831282
max-error-count 64
@@ -1442,9 +1441,7 @@ sync-master-info 10000
14421441
sync-relay-log 10000
14431442
sync-relay-log-info 10000
14441443
sysdate-is-now FALSE
1445-
table-cache 421
14461444
table-definition-cache 400
1447-
table-open-cache 421
14481445
tc-heuristic-recover OFF
14491446
thread-cache-size 0
14501447
thread-pool-idle-timeout 60

mysql-test/suite/sys_vars/r/table_open_cache_basic.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SET @start_value = @@global.table_open_cache ;
2-
SELECT @start_value;
3-
@start_value
4-
421
2+
SELECT @start_value > 400;
3+
@start_value > 400
4+
1
55
'#--------------------FN_DYNVARS_001_01------------------------#'
66
SET @@global.table_open_cache = 99;
77
SET @@global.table_open_cache = DeFAULT;
@@ -108,6 +108,6 @@ ERROR 42S02: Unknown table 'global' in field list
108108
SELECT table_open_cache = @@session.table_open_cache ;
109109
ERROR 42S22: Unknown column 'table_open_cache' in 'field list'
110110
SET @@global.table_open_cache = @start_value;
111-
SELECT @@global.table_open_cache ;
112-
@@global.table_open_cache
113-
421
111+
SELECT @@global.table_open_cache = @start_value ;
112+
@@global.table_open_cache = @start_value
113+
1

mysql-test/suite/sys_vars/t/table_open_cache_basic.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
##########################################################################
3636

3737
SET @start_value = @@global.table_open_cache ;
38-
SELECT @start_value;
38+
SELECT @start_value > 400;
3939

4040

4141
--echo '#--------------------FN_DYNVARS_001_01------------------------#'
@@ -165,7 +165,7 @@ SELECT table_open_cache = @@session.table_open_cache ;
165165
##############################
166166

167167
SET @@global.table_open_cache = @start_value;
168-
SELECT @@global.table_open_cache ;
168+
SELECT @@global.table_open_cache = @start_value ;
169169

170170

171171
##################################################################

mysql-test/t/mysqld--help.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ perl;
2323
log-slow-queries pid-file slow-query-log-file log-basename
2424
datadir slave-load-tmpdir tmpdir socket thread-pool-size
2525
large-files-support lower-case-file-system system-time-zone
26-
collation-server character-set-server log-tc-size version.*/;
26+
collation-server character-set-server log-tc-size table-cache
27+
table-open-cache max-connections version.*/;
2728

2829
# Plugins which may or may not be there:
2930
@plugins=qw/innodb archive blackhole federated partition

0 commit comments

Comments
 (0)