summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqld--help.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-03 10:47:52 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-03 12:19:59 +0200
commitd2f1c3ed6ccf823babf311970dfa0b7c57850db7 (patch)
tree7c3db13f204c0a0c08f48ddaa402e64a2e209192 /mysql-test/main/mysqld--help.result
parent212994f704496d01881f377e34e04bd007e5e298 (diff)
parentaf143474d8925cdbcfc0795a2bc274cbeaad8889 (diff)
downloadmariadb-git-d2f1c3ed6ccf823babf311970dfa0b7c57850db7.tar.gz
Merge branch '10.5' into bb-10.6-release
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
-rw-r--r--mysql-test/main/mysqld--help.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index bed2f6c86be..a3dac7fcfcb 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -504,6 +504,7 @@ The following specify which files/extra groups are read (specified before remain
administrative statements to the slow log if it is open.
Resets or sets the option 'admin' in
log_slow_disabled_statements
+ (Defaults to on; use --skip-log-slow-admin-statements to disable.)
--log-slow-disabled-statements=name
Don't log certain types of statements to slow log. Any
combination of: admin, call, slave, sp
@@ -524,6 +525,7 @@ The following specify which files/extra groups are read (specified before remain
Log slow statements executed by slave thread to the slow
log if it is open. Resets or sets the option 'slave' in
log_slow_disabled_statements
+ (Defaults to on; use --skip-log-slow-slave-statements to disable.)
--log-slow-verbosity=name
Verbosity level for the slow log. Any combination of:
innodb, query_plan, explain