1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

fix perfschema.sizing_* tests to run

still cannot be enabled permanently, but at least they
could be run manually, if needed
This commit is contained in:
Sergei Golubchik
2021-07-10 12:42:53 +02:00
parent e3814a74ee
commit bd3ac6758a
14 changed files with 158 additions and 93 deletions

View File

@ -0,0 +1,53 @@
# Default values that applies to all MySQL Servers
[mysqld]
local-infile
character-set-server= latin1
default-storage-engine=myisam
# Increase default connect_timeout to avoid intermittent
# disconnects when test servers are put under load see BUG#28359
connect-timeout= 60
log-bin-trust-function-creators=1
key_buffer_size= 1M
sort_buffer_size= 256K
max_heap_table_size= 1M
loose-innodb_data_file_path= ibdata1:10M:autoextend
loose-innodb_buffer_pool_size= 8M
loose-innodb_lru_scan_depth= 100
loose-innodb_write_io_threads= 2
loose-innodb_read_io_threads= 2
loose-innodb_log_buffer_size= 1M
loose-innodb_log_file_size= 5M
loose-innodb_log_files_in_group= 2
slave-net-timeout=120
log-bin=mysqld-bin
# No performance schema sizing provided
# Disable everything, we only need the sizing data,
# and also need a stable output for show engine performance_schema status
loose-performance-schema-consumer-global-instrumentation=OFF
loose-performance-schema-instrument='%=ON'
loose-performance-schema-consumer-events-stages-current=ON
loose-performance-schema-consumer-events-stages-history=ON
loose-performance-schema-consumer-events-stages-history-long=ON
loose-performance-schema-consumer-events-statements-current=ON
loose-performance-schema-consumer-events-statements-history=ON
loose-performance-schema-consumer-events-statements-history-long=ON
loose-performance-schema-consumer-events-transactions-current=ON
loose-performance-schema-consumer-events-transactions-history=ON
loose-performance-schema-consumer-events-transactions-history-long=ON
loose-performance-schema-consumer-events-waits-current=ON
loose-performance-schema-consumer-events-waits-history=ON
loose-performance-schema-consumer-events-waits-history-long=ON
loose-performance-schema-consumer-thread-instrumentation=ON
binlog-direct-non-transactional-updates

View File

@ -4,10 +4,7 @@
# For tests sensitive to the internal sizes (show engine performance_schema
# status), make sure we use a platform with aligned memory.
--disable_query_log
let $aligned = `SELECT count(*) from performance_schema.session_connect_attrs where PROCESSLIST_ID = connection_id() and ATTR_NAME = '_os' and ATTR_VALUE in ('Linux', 'Windows')`;
if (!$aligned)
if (`SELECT count(*)=0 from performance_schema.session_connect_attrs where PROCESSLIST_ID = connection_id() and ATTR_NAME = '_os' and ATTR_VALUE in ('Linux', 'Windows')`)
{
skip Need a platform with aligned memory;
}
--enable_query_log

View File

@ -3,7 +3,7 @@ show variables like "table_definition_cache";
show variables like "table_open_cache";
show variables like "max_connections";
# open_files_limit depends on OS configuration (ulimit -n)
#show variables like "open_files_limit";
show variables like "open_files_limit";
show variables where
`Variable_name` != "performance_schema_max_statement_classes" and
`Variable_name` like "performance_schema%";
@ -17,7 +17,7 @@ show status like "%performance_schema%";
# is very dependent on the platform,
# so it is not printed here to ensure stability of the .results files.
# To troubleshoot the performance schema memory consumption at different
# configuration settings, comment the following line.
# configuration settings, uncomment the following line.
# Debug only:
# show engine performance_schema status;