database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-29595 Adjust variable name for slow log file and help referring to the value

Browse Source
This commit is contained in:
Sergei Golubchik
2022-09-26 18:40:17 +02:00
parent ef08810b8b
commit 05c11953ab
10 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/log_slow.result
View File

@@ -15,7 +15,7 @@ log_slow_disabled_statements sp
log_slow_filter admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk log_slow_filter admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
log_slow_min_examined_row_limit 0 log_slow_min_examined_row_limit 0
log_slow_query ON log_slow_query ON
log_slow_query_file_name $PATH/mysqld-slow.log log_slow_query_file $PATH/mysqld-slow.log
log_slow_query_time 10.000000 log_slow_query_time 10.000000
log_slow_rate_limit 1 log_slow_rate_limit 1
log_slow_slave_statements ON log_slow_slave_statements ON

22
mysql-test/main/mysqld--help,win.rdiff
View File

@@ -1,6 +1,6 @@
--- a/mysql-test/r/mysqld--help.result --- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result
@@ -686,6 +686,7 @@ @@ -685,6 +685,7 @@
Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME, Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
DATETIME, TIMESTAMP columns. DATETIME, TIMESTAMP columns.
(Defaults to on; use --skip-mysql56-temporal-format to disable.) (Defaults to on; use --skip-mysql56-temporal-format to disable.)
@@ -8,10 +8,10 @@
--net-buffer-length=# --net-buffer-length=#
Buffer length for TCP/IP and socket communication Buffer length for TCP/IP and socket communication
--net-read-timeout=# --net-read-timeout=#
@@ -1328,6 +1329,10 @@ @@ -1327,6 +1328,10 @@
Alias for log_slow_query_file_name. Log slow queries to Alias for log_slow_query_file. Log slow queries to given
given log file. Defaults logging to 'hostname'-slow.log. log file. Defaults logging to 'hostname'-slow.log. Must
Must be enabled to activate other slow log options be enabled to activate other slow log options
+ --slow-start-timeout=# + --slow-start-timeout=#
+ Maximum number of milliseconds that the service control + Maximum number of milliseconds that the service control
+ manager should wait before trying to kill the windows + manager should wait before trying to kill the windows
@@ -19,7 +19,7 @@
--socket=name Socket file to use for connection --socket=name Socket file to use for connection
--sort-buffer-size=# --sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of Each thread that needs to do a sort allocates a buffer of
@@ -1352,6 +1357,7 @@ @@ -1351,6 +1356,7 @@
deleting or updating every row in a table. deleting or updating every row in a table.
--stack-trace Print a symbolic stack trace on failure --stack-trace Print a symbolic stack trace on failure
(Defaults to on; use --skip-stack-trace to disable.) (Defaults to on; use --skip-stack-trace to disable.)
@@ -27,7 +27,7 @@
--standard-compliant-cte --standard-compliant-cte
Allow only CTEs compliant to SQL standard Allow only CTEs compliant to SQL standard
(Defaults to on; use --skip-standard-compliant-cte to disable.) (Defaults to on; use --skip-standard-compliant-cte to disable.)
@@ -1427,6 +1433,11 @@ @@ -1426,6 +1432,11 @@
--thread-pool-max-threads=# --thread-pool-max-threads=#
Maximum allowed number of worker threads in the thread Maximum allowed number of worker threads in the thread
pool pool
@@ -39,7 +39,7 @@
--thread-pool-oversubscribe=# --thread-pool-oversubscribe=#
How many additional active worker threads in a group are How many additional active worker threads in a group are
allowed. allowed.
@@ -1465,8 +1476,8 @@ @@ -1464,8 +1475,8 @@
automatically convert it to an on-disk MyISAM or Aria automatically convert it to an on-disk MyISAM or Aria
table. table.
-t, --tmpdir=name Path for temporary files. Several paths may be specified, -t, --tmpdir=name Path for temporary files. Several paths may be specified,
@@ -50,7 +50,7 @@
--transaction-alloc-block-size=# --transaction-alloc-block-size=#
Allocation block size for transactions to be stored in Allocation block size for transactions to be stored in
binary log binary log
@@ -1686,6 +1697,7 @@ @@ -1685,6 +1696,7 @@
myisam-stats-method NULLS_UNEQUAL myisam-stats-method NULLS_UNEQUAL
myisam-use-mmap FALSE myisam-use-mmap FALSE
mysql56-temporal-format TRUE mysql56-temporal-format TRUE
@@ -58,7 +58,7 @@
net-buffer-length 16384 net-buffer-length 16384
net-read-timeout 30 net-read-timeout 30
net-retry-count 10 net-retry-count 10
@@ -1842,6 +1854,7 @@ @@ -1841,6 +1853,7 @@
slave-type-conversions slave-type-conversions
slow-launch-time 2 slow-launch-time 2
slow-query-log FALSE slow-query-log FALSE
@@ -66,7 +66,7 @@
sort-buffer-size 2097152 sort-buffer-size 2097152
sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
sql-safe-updates FALSE sql-safe-updates FALSE
@@ -1868,6 +1881,8 @@ @@ -1867,6 +1880,8 @@
thread-pool-exact-stats FALSE thread-pool-exact-stats FALSE
thread-pool-idle-timeout 60 thread-pool-idle-timeout 60
thread-pool-max-threads 65536 thread-pool-max-threads 65536

11
mysql-test/main/mysqld--help.result
View File

@@ -460,8 +460,7 @@ The following specify which files/extra groups are read (specified before remain
the only option you need for specifying log files. Sets the only option you need for specifying log files. Sets
names for --log-bin, --log-bin-index, --relay-log, names for --log-bin, --log-bin-index, --relay-log,
--relay-log-index, --general-log-file, --relay-log-index, --general-log-file,
--log-slow-query-log-file, --log-error-file, and --log-slow-query-file, --log-error-file, and --pid-file
--pid-file
--log-bin[=name] Log update queries in binary format. Optional argument --log-bin[=name] Log update queries in binary format. Optional argument
should be name for binary log. If not given should be name for binary log. If not given
'datadir'/'log-basename'-bin or 'datadir'/mysql-bin will 'datadir'/'log-basename'-bin or 'datadir'/mysql-bin will
@@ -530,7 +529,7 @@ The following specify which files/extra groups are read (specified before remain
to a file 'hostname'-slow.log or a table mysql.slow_log to a file 'hostname'-slow.log or a table mysql.slow_log
if --log-output=TABLE is used. Must be enabled to if --log-output=TABLE is used. Must be enabled to
activate other slow log options. activate other slow log options.
--log-slow-query-file-name=name --log-slow-query-file=name
Log slow queries to given log file. Defaults logging to Log slow queries to given log file. Defaults logging to
'hostname'-slow.log. Must be enabled to activate other 'hostname'-slow.log. Must be enabled to activate other
slow log options slow log options
@@ -1325,9 +1324,9 @@ The following specify which files/extra groups are read (specified before remain
or a table mysql.slow_log if --log-output=TABLE is used. or a table mysql.slow_log if --log-output=TABLE is used.
Must be enabled to activate other slow log options. Must be enabled to activate other slow log options.
--slow-query-log-file=name --slow-query-log-file=name
Alias for log_slow_query_file_name. Log slow queries to Alias for log_slow_query_file. Log slow queries to given
given log file. Defaults logging to 'hostname'-slow.log. log file. Defaults logging to 'hostname'-slow.log. Must
Must be enabled to activate other slow log options be enabled to activate other slow log options
--socket=name Socket file to use for connection --socket=name Socket file to use for connection
--sort-buffer-size=# --sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of Each thread that needs to do a sort allocates a buffer of

2
mysql-test/main/mysqld--help.test
View File

@@ -23,7 +23,7 @@ perl;
# their paths may vary: # their paths may vary:
@skipvars=qw/basedir open-files-limit general-log-file log plugin-dir plugin-maturity @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir plugin-maturity
log-slow-queries pid-file slow-query-log-file log-basename log-slow-queries pid-file slow-query-log-file log-basename
log-slow-query-file-name log-slow-query-file
datadir slave-load-tmpdir tmpdir socket thread-pool-size datadir slave-load-tmpdir tmpdir socket thread-pool-size
large-files-support lower-case-file-system system-time-zone large-files-support lower-case-file-system system-time-zone
collation-server character-set-server log-tc-size table-cache collation-server character-set-server log-tc-size table-cache

8
mysql-test/suite/sys_vars/r/slow_query_log_file_func.result
View File

@@ -2,8 +2,8 @@
## Checking if my_slow_test.log exists in servers datadir ## ## Checking if my_slow_test.log exists in servers datadir ##
## This case should pass because we have set this filename in opt file ## ## This case should pass because we have set this filename in opt file ##
set @oldval= @@global.slow_query_log_file; set @oldval= @@global.slow_query_log_file;
set global log_slow_query_file_name='$MYSQLTEST_VARDIR/tmp/slow-7567.log'; set global log_slow_query_file='$MYSQLTEST_VARDIR/tmp/slow-7567.log';
select @@global.log_slow_query_file_name; select @@global.log_slow_query_file;
@@global.log_slow_query_file_name @@global.log_slow_query_file
MYSQLTEST_VARDIR/tmp/slow-7567.log MYSQLTEST_VARDIR/tmp/slow-7567.log
set @@global.log_slow_query_file_name=@oldval; set @@global.log_slow_query_file=@oldval;

4
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View File

@@ -1712,7 +1712,7 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST OFF,ON ENUM_VALUE_LIST OFF,ON
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME LOG_SLOW_QUERY_FILE_NAME VARIABLE_NAME LOG_SLOW_QUERY_FILE
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options VARIABLE_COMMENT Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options
@@ -3235,7 +3235,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME SLOW_QUERY_LOG_FILE VARIABLE_NAME SLOW_QUERY_LOG_FILE
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Alias for log_slow_query_file_name. Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options VARIABLE_COMMENT Alias for log_slow_query_file. Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL

4
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@@ -1862,7 +1862,7 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST OFF,ON ENUM_VALUE_LIST OFF,ON
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME LOG_SLOW_QUERY_FILE_NAME VARIABLE_NAME LOG_SLOW_QUERY_FILE
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options VARIABLE_COMMENT Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options
@@ -3915,7 +3915,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME SLOW_QUERY_LOG_FILE VARIABLE_NAME SLOW_QUERY_LOG_FILE
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Alias for log_slow_query_file_name. Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options VARIABLE_COMMENT Alias for log_slow_query_file. Log slow queries to given log file. Defaults logging to 'hostname'-slow.log. Must be enabled to activate other slow log options
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL

6
mysql-test/suite/sys_vars/t/slow_query_log_file_func.test
View File

@@ -33,8 +33,8 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--echo ## This case should pass because we have set this filename in opt file ## --echo ## This case should pass because we have set this filename in opt file ##
set @oldval= @@global.slow_query_log_file; set @oldval= @@global.slow_query_log_file;
evalp set global log_slow_query_file_name='$MYSQLTEST_VARDIR/tmp/slow-7567.log'; evalp set global log_slow_query_file='$MYSQLTEST_VARDIR/tmp/slow-7567.log';
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
select @@global.log_slow_query_file_name; select @@global.log_slow_query_file;
--file_exists $MYSQLTEST_VARDIR/tmp/slow-7567.log --file_exists $MYSQLTEST_VARDIR/tmp/slow-7567.log
set @@global.log_slow_query_file_name=@oldval; set @@global.log_slow_query_file=@oldval;

2
sql/mysqld.cc
View File

@@ -6551,7 +6551,7 @@ struct my_option my_long_options[]=
"names at once (in 'datadir') and is normally the only option you need " "names at once (in 'datadir') and is normally the only option you need "
"for specifying log files. Sets names for --log-bin, --log-bin-index, " "for specifying log files. Sets names for --log-bin, --log-bin-index, "
"--relay-log, --relay-log-index, --general-log-file, " "--relay-log, --relay-log-index, --general-log-file, "
"--log-slow-query-log-file, --log-error-file, and --pid-file", "--log-slow-query-file, --log-error-file, and --pid-file",
&opt_log_basename, &opt_log_basename, 0, GET_STR, REQUIRED_ARG, &opt_log_basename, &opt_log_basename, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
{"log-bin", OPT_BIN_LOG, {"log-bin", OPT_BIN_LOG,

4
sql/sys_vars.cc
View File

@@ -5161,7 +5161,7 @@ static bool fix_slow_log_file(sys_var *self, THD *thd, enum_var_type type)
static Sys_var_charptr_fscs Sys_slow_log_path( static Sys_var_charptr_fscs Sys_slow_log_path(
"slow_query_log_file", "slow_query_log_file",
"Alias for log_slow_query_file_name. " "Alias for log_slow_query_file. "
"Log slow queries to given log file. " "Log slow queries to given log file. "
"Defaults logging to 'hostname'-slow.log. Must be enabled to activate " "Defaults logging to 'hostname'-slow.log. Must be enabled to activate "
"other slow log options", "other slow log options",
@@ -5170,7 +5170,7 @@ static Sys_var_charptr_fscs Sys_slow_log_path(
ON_CHECK(check_log_path), ON_UPDATE(fix_slow_log_file)); ON_CHECK(check_log_path), ON_UPDATE(fix_slow_log_file));
static Sys_var_charptr_fscs Sys_log_slow_query_file_name( static Sys_var_charptr_fscs Sys_log_slow_query_file_name(
"log_slow_query_file_name", "Log slow queries to given log file. " "log_slow_query_file", "Log slow queries to given log file. "
"Defaults logging to 'hostname'-slow.log. Must be enabled to activate " "Defaults logging to 'hostname'-slow.log. Must be enabled to activate "
"other slow log options", "other slow log options",
PREALLOCATED GLOBAL_VAR(opt_slow_logname), CMD_LINE(REQUIRED_ARG), PREALLOCATED GLOBAL_VAR(opt_slow_logname), CMD_LINE(REQUIRED_ARG),