Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f006e8d0
Commit
f006e8d0
authored
Nov 28, 2011
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
consistency fixes for mysqld --help
parent
ec24e6f6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
57 deletions
+42
-57
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-notwin.result
+16
-16
mysql-test/r/mysqld--help-win.result
mysql-test/r/mysqld--help-win.result
+16
-16
sql/mysqld.cc
sql/mysqld.cc
+6
-6
sql/sys_vars.cc
sql/sys_vars.cc
+4
-19
No files found.
mysql-test/r/mysqld--help-notwin.result
View file @
f006e8d0
...
...
@@ -197,7 +197,7 @@ The following options may be given as the first argument:
Use stopwords from this file instead of built-in list
--gdb Set up signals usable for debugging.
--general-log Log connections and queries to a table or log file.
Defaults logging to a file
hostname
.log or a table
Defaults logging to a file
'hostname'
.log or a table
mysql.general_logif --log-output=TABLE is used
--general-log-file=name
Log connections and queries to given file
...
...
@@ -270,11 +270,11 @@ The following options may be given as the first argument:
--pid-file
--log-bin[=name] Log update queries in binary format. Optional argument
should be name for binary log. If not given
datadir/'log-basename'-bin or 'datadir'/mysql-bin will be
used (the later if --log-basename is not specified). We
strongly recommend to use either --log-basename or
'datadir'/'log-basename'-bin or 'datadir'/mysql-bin will
be used (the later if --log-basename is not specified).
We
strongly recommend to use either --log-basename or
specify a filename to ensure that replication doesn't
stop if the real hostname of the computer changes
'
.
stop if the real hostname of the computer changes.
--log-bin-index=name
File that holds the names for last binary log files.
--log-bin-trust-function-creators
...
...
@@ -288,7 +288,7 @@ The following options may be given as the first argument:
can safely set this to TRUE
--log-error[=name] Log errors to file (instead of stdout). If file name is
not specified then 'datadir'/'log-basename'.err or the
pid-file
path with extension .err is used
'pid-file'
path with extension .err is used
--log-isam[=name] Log all MyISAM changes to file.
--log-output=name Syntax: log-output=value[,value...], where "value" could
be TABLE, FILE or NONE
...
...
@@ -315,7 +315,7 @@ The following options may be given as the first argument:
argument is a file name for the slow log. If not given,
'log-basename'-slow.log will be used. Use
--log-output=TABLE if you want to have the log in the
table
'mysql.slow_log'
. Deprecated option, use
table
mysql.slow_log
. Deprecated option, use
--slow-query-log/--slow-query-log-file instead.
--log-slow-rate-limit=#
Write to slow log every #th slow query. Set to 1 to log
...
...
@@ -535,10 +535,10 @@ The following options may be given as the first argument:
Maximum number of instrumented threads.
--pid-file=name Pid file used by safe_mysqld
--plugin-dir=name Directory for plugins
--plugin-load=name
Optional semicolon-separated list of plugins to load,
where each plugin is identified as name=library, wher
e
name is the plugin name and library is the plugin library
in plugin_dir
.
--plugin-load=name
Semicolon-separated list of plugins to load, where each
plugin is specified as ether a plugin_name=library_fil
e
pair or only a library_file. If the latter case, all
plugins from a given library_file will be loaded
.
--plugin-maturity=name
The lowest desirable plugin maturity (unknown,
experimental, alpha, beta, gamma, or stable). Plugins
...
...
@@ -760,13 +760,13 @@ The following options may be given as the first argument:
seconds), the Slow_launch_threads counter will be
incremented
--slow-query-log Log slow queries to a table or log file. Defaults logging
to a file
hostname-slow.log or a table mysql.slow_log if
--log-output=TABLE is used. Must be enabled to activate
other slow log options
to a file
'hostname'-slow.log or a table mysql.slow_log
if --log-output=TABLE is used. Must be enabled to
activate
other slow log options
--slow-query-log-file=name
Log slow queries to given log file. Defaults logging to
hostname-slow.log. Must be enabled to activate other slow
log options
'hostname'-slow.log. Must be enabled to activate other
slow
log options
--socket=name Socket file to use for connection
--sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of
...
...
mysql-test/r/mysqld--help-win.result
View file @
f006e8d0
...
...
@@ -197,7 +197,7 @@ The following options may be given as the first argument:
Use stopwords from this file instead of built-in list
--gdb Set up signals usable for debugging.
--general-log Log connections and queries to a table or log file.
Defaults logging to a file
hostname
.log or a table
Defaults logging to a file
'hostname'
.log or a table
mysql.general_logif --log-output=TABLE is used
--general-log-file=name
Log connections and queries to given file
...
...
@@ -269,11 +269,11 @@ The following options may be given as the first argument:
--pid-file
--log-bin[=name] Log update queries in binary format. Optional argument
should be name for binary log. If not given
datadir/'log-basename'-bin or 'datadir'/mysql-bin will be
used (the later if --log-basename is not specified). We
strongly recommend to use either --log-basename or
'datadir'/'log-basename'-bin or 'datadir'/mysql-bin will
be used (the later if --log-basename is not specified).
We
strongly recommend to use either --log-basename or
specify a filename to ensure that replication doesn't
stop if the real hostname of the computer changes
'
.
stop if the real hostname of the computer changes.
--log-bin-index=name
File that holds the names for last binary log files.
--log-bin-trust-function-creators
...
...
@@ -287,7 +287,7 @@ The following options may be given as the first argument:
can safely set this to TRUE
--log-error[=name] Log errors to file (instead of stdout). If file name is
not specified then 'datadir'/'log-basename'.err or the
pid-file
path with extension .err is used
'pid-file'
path with extension .err is used
--log-isam[=name] Log all MyISAM changes to file.
--log-output=name Syntax: log-output=value[,value...], where "value" could
be TABLE, FILE or NONE
...
...
@@ -314,7 +314,7 @@ The following options may be given as the first argument:
argument is a file name for the slow log. If not given,
'log-basename'-slow.log will be used. Use
--log-output=TABLE if you want to have the log in the
table
'mysql.slow_log'
. Deprecated option, use
table
mysql.slow_log
. Deprecated option, use
--slow-query-log/--slow-query-log-file instead.
--log-slow-rate-limit=#
Write to slow log every #th slow query. Set to 1 to log
...
...
@@ -535,10 +535,10 @@ The following options may be given as the first argument:
Maximum number of instrumented threads.
--pid-file=name Pid file used by safe_mysqld
--plugin-dir=name Directory for plugins
--plugin-load=name
Optional semicolon-separated list of plugins to load,
where each plugin is identified as name=library, wher
e
name is the plugin name and library is the plugin library
in plugin_dir
.
--plugin-load=name
Semicolon-separated list of plugins to load, where each
plugin is specified as ether a plugin_name=library_fil
e
pair or only a library_file. If the latter case, all
plugins from a given library_file will be loaded
.
--plugin-maturity=name
The lowest desirable plugin maturity (unknown,
experimental, alpha, beta, gamma, or stable). Plugins
...
...
@@ -763,13 +763,13 @@ The following options may be given as the first argument:
seconds), the Slow_launch_threads counter will be
incremented
--slow-query-log Log slow queries to a table or log file. Defaults logging
to a file
hostname-slow.log or a table mysql.slow_log if
--log-output=TABLE is used. Must be enabled to activate
other slow log options
to a file
'hostname'-slow.log or a table mysql.slow_log
if --log-output=TABLE is used. Must be enabled to
activate
other slow log options
--slow-query-log-file=name
Log slow queries to given log file. Defaults logging to
hostname-slow.log. Must be enabled to activate other slow
log options
'hostname'-slow.log. Must be enabled to activate other
slow
log options
--socket=name Socket file to use for connection
--sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of
...
...
sql/mysqld.cc
View file @
f006e8d0
...
...
@@ -6321,10 +6321,10 @@ struct my_option my_long_options[]=
{
"log-bin"
,
OPT_BIN_LOG
,
"Log update queries in binary format. Optional argument should be name for "
"binary log. If not given "
"
datadir
/'log-basename'-bin or 'datadir'/mysql-bin will be used (the later if "
"
'datadir'
/'log-basename'-bin or 'datadir'/mysql-bin will be used (the later if "
"--log-basename is not specified). We strongly recommend to use either "
"--log-basename or specify a filename to ensure that replication doesn't "
"stop if the real hostname of the computer changes
'
."
,
"stop if the real hostname of the computer changes."
,
&
opt_bin_logname
,
&
opt_bin_logname
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"log-bin-index"
,
0
,
...
...
@@ -6350,7 +6350,7 @@ struct my_option my_long_options[]=
"Enable logging of slow queries (longer than --long-query-time) to log file "
"or table. Optional argument is a file name for the slow log. If not given, "
"'log-basename'-slow.log will be used. Use --log-output=TABLE if you want "
"to have the log in the table
'mysql.slow_log'
. "
"to have the log in the table
mysql.slow_log
. "
"Deprecated option, use --slow-query-log/--slow-query-log-file instead."
,
&
opt_slow_logname
,
&
opt_slow_logname
,
0
,
GET_STR_ALLOC
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
...
...
@@ -6549,9 +6549,9 @@ struct my_option my_long_options[]=
{
"version"
,
'V'
,
"Output version information and exit."
,
0
,
0
,
0
,
GET_NO_ARG
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"plugin-load"
,
0
,
"
Optional s
emicolon-separated list of plugins to load, where each plugin is "
"
identified as name=library, where name is the plugin name and library
"
"
is the plugin library in plugin_dir
."
,
"
S
emicolon-separated list of plugins to load, where each plugin is "
"
specified as ether a plugin_name=library_file pair or only a library_file.
"
"
If the latter case, all plugins from a given library_file will be loaded
."
,
&
opt_plugin_load
,
&
opt_plugin_load
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"table_cache"
,
0
,
"Deprecated; use --table-open-cache instead."
,
...
...
sql/sys_vars.cc
View file @
f006e8d0
...
...
@@ -914,7 +914,7 @@ static Sys_var_mybool Sys_trust_function_creators(
static
Sys_var_charptr
Sys_log_error
(
"log_error"
,
"Log errors to file (instead of stdout). If file name is not specified "
"then 'datadir'/'log-basename'.err or the
pid-file
path with extension "
"then 'datadir'/'log-basename'.err or the
'pid-file'
path with extension "
".err is used"
,
READ_ONLY
GLOBAL_VAR
(
log_error_file_ptr
),
CMD_LINE
(
OPT_ARG
,
OPT_LOG_ERROR
),
...
...
@@ -2847,7 +2847,7 @@ static bool fix_slow_log_file(sys_var *self, THD *thd, enum_var_type type)
}
static
Sys_var_charptr
Sys_slow_log_path
(
"slow_query_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"
,
PREALLOCATED
GLOBAL_VAR
(
opt_slow_logname
),
CMD_LINE
(
REQUIRED_ARG
),
IN_FS_CHARSET
,
DEFAULT
(
0
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
...
...
@@ -2915,7 +2915,7 @@ static Sys_var_have Sys_have_symlink(
static
bool
fix_log_state
(
sys_var
*
self
,
THD
*
thd
,
enum_var_type
type
);
static
Sys_var_mybool
Sys_general_log
(
"general_log"
,
"Log connections and queries to a table or log file. "
"Defaults logging to a file
hostname
.log or a table mysql.general_log"
"Defaults logging to a file
'hostname'
.log or a table mysql.general_log"
"if --log-output=TABLE is used"
,
GLOBAL_VAR
(
opt_log
),
CMD_LINE
(
OPT_ARG
),
DEFAULT
(
FALSE
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_CHECK
(
0
),
...
...
@@ -2931,7 +2931,7 @@ static Sys_var_mybool Sys_log(
static
Sys_var_mybool
Sys_slow_query_log
(
"slow_query_log"
,
"Log slow queries to a table or log file. Defaults logging to a file "
"
hostname
-slow.log or a table mysql.slow_log if --log-output=TABLE is "
"
'hostname'
-slow.log or a table mysql.slow_log if --log-output=TABLE is "
"used. Must be enabled to activate other slow log options"
,
GLOBAL_VAR
(
opt_slow_log
),
CMD_LINE
(
OPT_ARG
),
DEFAULT
(
FALSE
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_CHECK
(
0
),
...
...
@@ -3400,21 +3400,6 @@ static Sys_var_mybool Sys_thread_alarm(
READ_ONLY
GLOBAL_VAR
(
opt_thread_alarm
),
CMD_LINE
(
OPT_ARG
),
DEFAULT
(
TRUE
));
#if 0
static Sys_var_charptr Sys_log_basename(
"log_basename",
"Basename for all log files and the .pid file. This sets all log file "
"names at once (in 'datadir') and is normally the only option you need "
"for specifying log files. This is especially recommend to be set if you "
"are using replication as it ensures that your log file names are not "
"depending on your host name. Sets names for --log-bin, --log-bin-index, "
"--relay-log, --relay-log-index, --general-log-file, "
"--log-slow-query-log-file, --log-error-file and --pid-file",
READ_ONLY GLOBAL_VAR(opt_log_basename),
CMD_LINE(REQUIRED_ARG, OPT_LOG_BASENAME),
IN_FS_CHARSET, DEFAULT(0));
#endif
static
Sys_var_mybool
Sys_query_cache_strip_comments
(
"query_cache_strip_comments"
,
"Strip all comments from a query before storing it "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment