#At file:///usr/home/serg/Abk/mysql/next-mr/ based on revid:serg@stripped
2955 Sergei Golubchik 2009-12-15
mysqld --help
modified:
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysys/my_getopt.c
sql/sql_class.h
sql/sys_vars.cc
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result 2009-12-15 06:42:48 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result 2009-12-15 15:14:18 +0000
@@ -17,18 +17,18 @@ The following options may be given as th
--archive[=name] Enable or disable ARCHIVE plugin. Possible values are ON,
OFF, FORCE (don't start if the plugin fails to load).
--auto-increment-increment[=#]
- Auto-increment columns are incremented by this.
+ Auto-increment columns are incremented by this
--auto-increment-offset[=#]
Offset added to Auto-increment columns. Used when
- auto-increment-increment != 1.
+ auto-increment-increment != 1
--automatic-sp-privileges
- Creating and dropping stored procedures alters ACLs.
- (Defaults to on; use --skip-automatic_sp_privileges to disable.)
+ Creating and dropping stored procedures alters ACLs
+ (Defaults to on; use --skip-automatic-sp-privileges to disable.)
--back-log=# The number of outstanding connection requests MySQL can
have. This comes into play when the main MySQL thread
- gets very many connection requests in a very short time.
+ gets very many connection requests in a very short time
-b, --basedir=name Path to installation directory. All paths are usually
- resolved relative to this.
+ resolved relative to this
--big-tables Allow big result sets by saving all temporary sets on
file (Solves most 'table full' errors)
--bind-address=name IP address to bind to.
@@ -36,22 +36,22 @@ The following options may be given as th
The size of the cache to hold the SQL statements for the
binary log during a transaction. If you often use big,
multi-statement transactions you can increase this to get
- more performance.
+ more performance
--binlog-do-db=name Tells the master it should log updates for the specified
database, and exclude all others not explicitly
mentioned.
--binlog-format=name
What form of binary logging the master will use: either
- 'row' for row-based binary logging, or 'statement' for
- statement-based binary logging, or 'mixed'. 'mixed' is
+ ROW for row-based binary logging, STATEMENT for
+ statement-based binary logging, or MIXED. MIXED is
statement-based binary logging except for those
statements where only row-based is correct: those which
involve user-defined functions (i.e. UDFs) or the UUID()
function; for those, row-based binary logging is
automatically used. If NDBCLUSTER is enabled and
- binlog_format is 'mixed', the format switches to 'row'
+ binlog-format is MIXED, the format switches to row-based
and back implicitly per each query accessing an
- NDBCLUSTER table.
+ NDBCLUSTER table
--binlog-ignore-db=name
Tells the master that updates to the given database
should not be logged tothe binary log.
@@ -74,7 +74,7 @@ The following options may be given as th
-C, --character-set-server=name
Set the default character set.
--character-sets-dir=name
- Directory where character sets are.
+ Directory where character sets are
-r, --chroot=name Chroot mysqld daemon during startup.
--collation-server=name
Set the default collation.
@@ -85,14 +85,14 @@ The following options may be given as th
Use concurrent insert with MyISAM. Possible values are
NEVER, AUTO, ALWAYS
--connect-timeout=# The number of seconds the mysqld server is waiting for a
- connect packet before responding with 'Bad handshake'.
+ connect packet before responding with 'Bad handshake'
--console Write error output on screen; Don't remove the console
window on windows.
--core-file Write core on errors.
- -h, --datadir=name Path to the database root directory.
- --date-format=name The DATE format (for future)
+ -h, --datadir=name Path to the database root directory
+ --date-format=name The DATE format (ignored)
--datetime-format=name
- The DATETIME format (for future)
+ The DATETIME format (ignored)
-C, --default-character-set=name
Set the default character set (deprecated option, use
--character-set-server instead).
@@ -106,7 +106,7 @@ The following options may be given as th
--default-week-format=#
The default week format used by WEEK() functions
--delay-key-write[=name]
- Type of DELAY_KEY_WRITE.
+ Type of DELAY_KEY_WRITE
--delay-key-write-for-all-tables
Don't flush key buffers between writes for any MyISAM
table (Deprecated option, use --delay-key-write=all
@@ -115,15 +115,15 @@ The following options may be given as th
After inserting delayed_insert_limit rows, the INSERT
DELAYED handler will check if there are any SELECT
statements pending. If so, it allows these to execute
- before continuing.
+ before continuing
--delayed-insert-timeout=#
How long a INSERT DELAYED thread should wait for INSERT
- statements before terminating.
+ statements before terminating
--delayed-queue-size=#
What size queue (in rows) should be allocated for
handling INSERT DELAYED. If the queue becomes full, any
client that does INSERT DELAYED will wait until there is
- room in the queue again.
+ room in the queue again
--des-key-file=name Load keys for des_encrypt() and des_encrypt from given
file.
--disconnect-slave-event-count=#
@@ -135,57 +135,61 @@ The following options may be given as th
--enable-locking Deprecated option, use --external-locking instead.
--engine-condition-pushdown
Push supported query conditions to the storage engine
- (Defaults to on; use --skip-engine_condition_pushdown to disable.)
+ (Defaults to on; use --skip-engine-condition-pushdown to disable.)
--event-scheduler[=name]
- Enable the event scheduler.
+ Enable the event scheduler. Possible values are ON, OFF,
+ and DISABLED (keep the event scheduler completely
+ deactivated, it cannot be activated run-time)
-T, --exit-info[=#] Used for debugging; Use at your own risk!
--expire-logs-days=#
If non-zero, binary logs will be purged after
expire_logs_days days; possible purges happen at startup
- and at binary log rotation.
+ and at binary log rotation
--external-locking Use system (external) locking (disabled by default).
With this option enabled you can run myisamchk to test
(not repair) tables while the MySQL server is running.
Disable with --skip-external-locking.
--federated[=name] Enable or disable FEDERATED plugin. Possible values are
ON, OFF, FORCE (don't start if the plugin fails to load).
- --flush Flush MyISAM tables to disk between SQL commands.
+ --flush Flush MyISAM tables to disk between SQL commands
--flush-time=# A dedicated thread is created to flush all tables at the
- given interval.
+ given interval
--ft-boolean-syntax=name
List of operators for MATCH ... AGAINST ( ... IN BOOLEAN
- MODE).
+ MODE)
--ft-max-word-len=# The maximum length of the word to be included in a
FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
- after changing this variable.
+ after changing this variable
--ft-min-word-len=# The minimum length of the word to be included in a
FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
- after changing this variable.
+ after changing this variable
--ft-query-expansion-limit=#
Number of best matches to use for query expansion
--ft-stopword-file=name
- Use stopwords from this file instead of built-in list.
+ Use stopwords from this file instead of built-in list
--gdb Set up signals usable for debugging
- --general-log Log connections and queries to file
+ --general-log Log connections and queries to a table or log file.
+ 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
--group-concat-max-len=#
The maximum length of the result of function
- group_concat
+ GROUP_CONCAT()
-?, --help Display this help and exit.
--ignore-builtin-innodb
- Disable initialization of builtin InnoDB plugin.
+ Disable initialization of builtin InnoDB plugin
--init-connect=name Command(s) that are executed for each new connection
- --init-file=name Read SQL commands from this file at startup.
+ --init-file=name Read SQL commands from this file at startup
--init-rpl-role=name
Set the replication role.
--init-slave=name Command(s) that are executed when a slave connects to
this master
--interactive-timeout=#
The number of seconds the server waits for activity on an
- interactive connection before closing it.
+ interactive connection before closing it
--join-buffer-size=#
- The size of the buffer that is used for full joins.
+ The size of the buffer that is used for full joins
--keep-files-on-create
Don't overwrite stale .MYD and .MYI even if no directory
is specified
@@ -213,7 +217,7 @@ The following options may be given as th
Set the language used for the month names and the days of
the week.
--local-infile Enable LOAD DATA LOCAL INFILE
- (Defaults to on; use --skip-local_infile to disable.)
+ (Defaults to on; use --skip-local-infile to disable.)
-l, --log[=name] Log connections and queries to file (deprecated option,
use --general-log/--general-log-file instead).
--log-bin[=name] Log update queries in binary format. Optional (but
@@ -410,9 +414,6 @@ The following options may be given as th
is one of {index_merge, index_merge_union,
index_merge_sort_union, index_merge_intersection} and val
is one of {on, off, default}
- --optimizer-use-mrr=name
- Controls whether the optimizer uses the Multi-Range Read
- (MRR) access method
--partition[=name] Enable or disable partition plugin. Possible values are
ON, OFF, FORCE (don't start if the plugin fails to load).
--pid-file=name Pid file used by safe_mysqld
@@ -421,9 +422,9 @@ The following options may be given as th
where each plugin is identified as name=library, where
name is the plugin name and library is the plugin library
in plugin_dir.
- -P, --port=# Port number to use for connection or 0 for default to, in
- order of preference, my.cnf, $MYSQL_TCP_PORT,
- /etc/services, built-in default (3306)
+ -P, --port=# Port number to use for connection or 0 to default to,
+ my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default
+ (3306), whatever comes first
--port-open-timeout=#
Maximum time in seconds to wait for the port to become
free. (Default: no wait)
@@ -473,7 +474,7 @@ The following options may be given as th
the SQL replication thread is in the relay logs
--relay-log-purge if disabled - do not purge relay logs. if enabled - purge
them as soon as they are no more needed
- (Defaults to on; use --skip-relay_log_purge to disable.)
+ (Defaults to on; use --skip-relay-log-purge to disable.)
--relay-log-recovery
Enables automatic relay log recovery right after the
database startup, which means that the IO Thread starts
@@ -622,8 +623,8 @@ The following options may be given as th
seconds), the Slow_launch_threads counter will be
incremented
--slow-query-log Log slow queries to a table or log file. Defaults logging
- to table mysql.slow_log or hostname-slow.log if
- --log-output=file is used. Must be enabled to activate
+ 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
@@ -640,15 +641,13 @@ The following options may be given as th
The update log is deprecated since version 5.0, is
replaced by the binary log and this option does nothing
anymore.
- --sql-mode=name Syntax: sql-mode=option[,option[,option...]] where
- 'option' can be one of: REAL_AS_FLOAT, PIPES_AS_CONCAT,
- ANSI_QUOTES, IGNORE_SPACE, ONLY_FULL_GROUP_BY,
- NO_UNSIGNED_SUBTRACTION
+ --sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
+ for the complete list of valid sql modes
--ssl Enable SSL for connection (automatically enabled with
other flags).
--ssl-ca=name CA file in PEM format (check OpenSSL docs, implies --ssl)
--ssl-capath=name CA directory (check OpenSSL docs, implies --ssl)
- --ssl-cert=name X509 cert in PEM format (implies --ssl).
+ --ssl-cert=name X509 cert in PEM format (implies --ssl)
--ssl-cipher=name SSL cipher to use (implies --ssl)
--ssl-key=name X509 key in PEM format (implies --ssl)
--super-large-pages Enable support for super large pages.
@@ -657,7 +656,7 @@ The following options may be given as th
--sync-binlog=# Synchronously flush binary log to disk after every #th
event. Use 0 (default) to disable synchronous flushing
--sync-frm Sync .frm files to disk on creation
- (Defaults to on; use --skip-sync_frm to disable.)
+ (Defaults to on; use --skip-sync-frm to disable.)
--sync-master-info=#
Synchronously flush master info to disk after every #th
event. Use 0 (default) to disable synchronous flushing
@@ -689,7 +688,7 @@ The following options may be given as th
Define threads usage for handling queries, one of
one-thread-per-connection, no-threads
--thread-stack=# The stack size for each thread
- --time-format=name The TIME format (for future)
+ --time-format=name The TIME format (ignored)
--timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
currently supported)
--tmp-table-size=# If an internal in-memory temporary table exceeds this
@@ -697,7 +696,7 @@ The following options may be given as th
MyISAM table
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
separated by a colon (:), in this case they are used in a
- round-robin fashion.
+ round-robin fashion
--transaction-alloc-block-size=#
Allocation block size for transactions to be stored in
binary log
@@ -712,7 +711,7 @@ The following options may be given as th
used in queries with a LIMIT clause for updating. NO =
Prohibit update of a VIEW, which does not contain a key
of the underlying table and the query uses a LIMIT clause
- (usually get from GUI tools).
+ (usually get from GUI tools)
-s, --use-symbolic-links
Enable symbolic link support. Deprecated option; use
--symbolic-links instead.
@@ -858,7 +857,6 @@ old-style-user-limits FALS
optimizer-prune-level 1
optimizer-search-depth 62
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on
-optimizer-use-mrr force
partition ON
plugin-load (No default value)
port 3306
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result 2009-12-15 06:42:48 +0000
+++ b/mysql-test/r/mysqld--help-win.result 2009-12-15 15:14:18 +0000
@@ -17,18 +17,18 @@ The following options may be given as th
--archive[=name] Enable or disable ARCHIVE plugin. Possible values are ON,
OFF, FORCE (don't start if the plugin fails to load).
--auto-increment-increment[=#]
- Auto-increment columns are incremented by this.
+ Auto-increment columns are incremented by this
--auto-increment-offset[=#]
Offset added to Auto-increment columns. Used when
- auto-increment-increment != 1.
+ auto-increment-increment != 1
--automatic-sp-privileges
- Creating and dropping stored procedures alters ACLs.
- (Defaults to on; use --skip-automatic_sp_privileges to disable.)
+ Creating and dropping stored procedures alters ACLs
+ (Defaults to on; use --skip-automatic-sp-privileges to disable.)
--back-log=# The number of outstanding connection requests MySQL can
have. This comes into play when the main MySQL thread
- gets very many connection requests in a very short time.
+ gets very many connection requests in a very short time
-b, --basedir=name Path to installation directory. All paths are usually
- resolved relative to this.
+ resolved relative to this
--big-tables Allow big result sets by saving all temporary sets on
file (Solves most 'table full' errors)
--bind-address=name IP address to bind to.
@@ -36,22 +36,22 @@ The following options may be given as th
The size of the cache to hold the SQL statements for the
binary log during a transaction. If you often use big,
multi-statement transactions you can increase this to get
- more performance.
+ more performance
--binlog-do-db=name Tells the master it should log updates for the specified
database, and exclude all others not explicitly
mentioned.
--binlog-format=name
What form of binary logging the master will use: either
- 'row' for row-based binary logging, or 'statement' for
- statement-based binary logging, or 'mixed'. 'mixed' is
+ ROW for row-based binary logging, STATEMENT for
+ statement-based binary logging, or MIXED. MIXED is
statement-based binary logging except for those
statements where only row-based is correct: those which
involve user-defined functions (i.e. UDFs) or the UUID()
function; for those, row-based binary logging is
automatically used. If NDBCLUSTER is enabled and
- binlog_format is 'mixed', the format switches to 'row'
+ binlog-format is MIXED, the format switches to row-based
and back implicitly per each query accessing an
- NDBCLUSTER table.
+ NDBCLUSTER table
--binlog-ignore-db=name
Tells the master that updates to the given database
should not be logged tothe binary log.
@@ -74,7 +74,7 @@ The following options may be given as th
-C, --character-set-server=name
Set the default character set.
--character-sets-dir=name
- Directory where character sets are.
+ Directory where character sets are
-r, --chroot=name Chroot mysqld daemon during startup.
--collation-server=name
Set the default collation.
@@ -85,14 +85,14 @@ The following options may be given as th
Use concurrent insert with MyISAM. Possible values are
NEVER, AUTO, ALWAYS
--connect-timeout=# The number of seconds the mysqld server is waiting for a
- connect packet before responding with 'Bad handshake'.
+ connect packet before responding with 'Bad handshake'
--console Write error output on screen; Don't remove the console
window on windows.
--core-file Write core on errors.
- -h, --datadir=name Path to the database root directory.
- --date-format=name The DATE format (for future)
+ -h, --datadir=name Path to the database root directory
+ --date-format=name The DATE format (ignored)
--datetime-format=name
- The DATETIME format (for future)
+ The DATETIME format (ignored)
-C, --default-character-set=name
Set the default character set (deprecated option, use
--character-set-server instead).
@@ -106,7 +106,7 @@ The following options may be given as th
--default-week-format=#
The default week format used by WEEK() functions
--delay-key-write[=name]
- Type of DELAY_KEY_WRITE.
+ Type of DELAY_KEY_WRITE
--delay-key-write-for-all-tables
Don't flush key buffers between writes for any MyISAM
table (Deprecated option, use --delay-key-write=all
@@ -115,15 +115,15 @@ The following options may be given as th
After inserting delayed_insert_limit rows, the INSERT
DELAYED handler will check if there are any SELECT
statements pending. If so, it allows these to execute
- before continuing.
+ before continuing
--delayed-insert-timeout=#
How long a INSERT DELAYED thread should wait for INSERT
- statements before terminating.
+ statements before terminating
--delayed-queue-size=#
What size queue (in rows) should be allocated for
handling INSERT DELAYED. If the queue becomes full, any
client that does INSERT DELAYED will wait until there is
- room in the queue again.
+ room in the queue again
--des-key-file=name Load keys for des_encrypt() and des_encrypt from given
file.
--disconnect-slave-event-count=#
@@ -135,57 +135,61 @@ The following options may be given as th
--enable-locking Deprecated option, use --external-locking instead.
--engine-condition-pushdown
Push supported query conditions to the storage engine
- (Defaults to on; use --skip-engine_condition_pushdown to disable.)
+ (Defaults to on; use --skip-engine-condition-pushdown to disable.)
--event-scheduler[=name]
- Enable the event scheduler.
+ Enable the event scheduler. Possible values are ON, OFF,
+ and DISABLED (keep the event scheduler completely
+ deactivated, it cannot be activated run-time)
-T, --exit-info[=#] Used for debugging; Use at your own risk!
--expire-logs-days=#
If non-zero, binary logs will be purged after
expire_logs_days days; possible purges happen at startup
- and at binary log rotation.
+ and at binary log rotation
--external-locking Use system (external) locking (disabled by default).
With this option enabled you can run myisamchk to test
(not repair) tables while the MySQL server is running.
Disable with --skip-external-locking.
--federated[=name] Enable or disable FEDERATED plugin. Possible values are
ON, OFF, FORCE (don't start if the plugin fails to load).
- --flush Flush MyISAM tables to disk between SQL commands.
+ --flush Flush MyISAM tables to disk between SQL commands
--flush-time=# A dedicated thread is created to flush all tables at the
- given interval.
+ given interval
--ft-boolean-syntax=name
List of operators for MATCH ... AGAINST ( ... IN BOOLEAN
- MODE).
+ MODE)
--ft-max-word-len=# The maximum length of the word to be included in a
FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
- after changing this variable.
+ after changing this variable
--ft-min-word-len=# The minimum length of the word to be included in a
FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
- after changing this variable.
+ after changing this variable
--ft-query-expansion-limit=#
Number of best matches to use for query expansion
--ft-stopword-file=name
- Use stopwords from this file instead of built-in list.
+ Use stopwords from this file instead of built-in list
--gdb Set up signals usable for debugging
- --general-log Log connections and queries to file
+ --general-log Log connections and queries to a table or log file.
+ 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
--group-concat-max-len=#
The maximum length of the result of function
- group_concat
+ GROUP_CONCAT()
-?, --help Display this help and exit.
--ignore-builtin-innodb
- Disable initialization of builtin InnoDB plugin.
+ Disable initialization of builtin InnoDB plugin
--init-connect=name Command(s) that are executed for each new connection
- --init-file=name Read SQL commands from this file at startup.
+ --init-file=name Read SQL commands from this file at startup
--init-rpl-role=name
Set the replication role.
--init-slave=name Command(s) that are executed when a slave connects to
this master
--interactive-timeout=#
The number of seconds the server waits for activity on an
- interactive connection before closing it.
+ interactive connection before closing it
--join-buffer-size=#
- The size of the buffer that is used for full joins.
+ The size of the buffer that is used for full joins
--keep-files-on-create
Don't overwrite stale .MYD and .MYI even if no directory
is specified
@@ -212,7 +216,7 @@ The following options may be given as th
Set the language used for the month names and the days of
the week.
--local-infile Enable LOAD DATA LOCAL INFILE
- (Defaults to on; use --skip-local_infile to disable.)
+ (Defaults to on; use --skip-local-infile to disable.)
-l, --log[=name] Log connections and queries to file (deprecated option,
use --general-log/--general-log-file instead).
--log-bin[=name] Log update queries in binary format. Optional (but
@@ -410,9 +414,6 @@ The following options may be given as th
is one of {index_merge, index_merge_union,
index_merge_sort_union, index_merge_intersection} and val
is one of {on, off, default}
- --optimizer-use-mrr=name
- Controls whether the optimizer uses the Multi-Range Read
- (MRR) access method
--partition[=name] Enable or disable partition plugin. Possible values are
ON, OFF, FORCE (don't start if the plugin fails to load).
--pid-file=name Pid file used by safe_mysqld
@@ -421,9 +422,9 @@ The following options may be given as th
where each plugin is identified as name=library, where
name is the plugin name and library is the plugin library
in plugin_dir.
- -P, --port=# Port number to use for connection or 0 for default to, in
- order of preference, my.cnf, $MYSQL_TCP_PORT,
- /etc/services, built-in default (3306)
+ -P, --port=# Port number to use for connection or 0 to default to,
+ my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default
+ (3306), whatever comes first
--port-open-timeout=#
Maximum time in seconds to wait for the port to become
free. (Default: no wait)
@@ -473,7 +474,7 @@ The following options may be given as th
the SQL replication thread is in the relay logs
--relay-log-purge if disabled - do not purge relay logs. if enabled - purge
them as soon as they are no more needed
- (Defaults to on; use --skip-relay_log_purge to disable.)
+ (Defaults to on; use --skip-relay-log-purge to disable.)
--relay-log-recovery
Enables automatic relay log recovery right after the
database startup, which means that the IO Thread starts
@@ -625,8 +626,8 @@ The following options may be given as th
seconds), the Slow_launch_threads counter will be
incremented
--slow-query-log Log slow queries to a table or log file. Defaults logging
- to table mysql.slow_log or hostname-slow.log if
- --log-output=file is used. Must be enabled to activate
+ 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
@@ -643,15 +644,13 @@ The following options may be given as th
The update log is deprecated since version 5.0, is
replaced by the binary log and this option does nothing
anymore.
- --sql-mode=name Syntax: sql-mode=option[,option[,option...]] where
- 'option' can be one of: REAL_AS_FLOAT, PIPES_AS_CONCAT,
- ANSI_QUOTES, IGNORE_SPACE, ONLY_FULL_GROUP_BY,
- NO_UNSIGNED_SUBTRACTION
+ --sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
+ for the complete list of valid sql modes
--ssl Enable SSL for connection (automatically enabled with
other flags).
--ssl-ca=name CA file in PEM format (check OpenSSL docs, implies --ssl)
--ssl-capath=name CA directory (check OpenSSL docs, implies --ssl)
- --ssl-cert=name X509 cert in PEM format (implies --ssl).
+ --ssl-cert=name X509 cert in PEM format (implies --ssl)
--ssl-cipher=name SSL cipher to use (implies --ssl)
--ssl-key=name X509 key in PEM format (implies --ssl)
--standalone Dummy option to start as a standalone program (NT).
@@ -660,7 +659,7 @@ The following options may be given as th
--sync-binlog=# Synchronously flush binary log to disk after every #th
event. Use 0 (default) to disable synchronous flushing
--sync-frm Sync .frm files to disk on creation
- (Defaults to on; use --skip-sync_frm to disable.)
+ (Defaults to on; use --skip-sync-frm to disable.)
--sync-master-info=#
Synchronously flush master info to disk after every #th
event. Use 0 (default) to disable synchronous flushing
@@ -692,7 +691,7 @@ The following options may be given as th
Define threads usage for handling queries, one of
one-thread-per-connection, no-threads
--thread-stack=# The stack size for each thread
- --time-format=name The TIME format (for future)
+ --time-format=name The TIME format (ignored)
--timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
currently supported)
--tmp-table-size=# If an internal in-memory temporary table exceeds this
@@ -700,7 +699,7 @@ The following options may be given as th
MyISAM table
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
separated by a semicolon (;), in this case they are used
- in a round-robin fashion.
+ in a round-robin fashion
--transaction-alloc-block-size=#
Allocation block size for transactions to be stored in
binary log
@@ -715,7 +714,7 @@ The following options may be given as th
used in queries with a LIMIT clause for updating. NO =
Prohibit update of a VIEW, which does not contain a key
of the underlying table and the query uses a LIMIT clause
- (usually get from GUI tools).
+ (usually get from GUI tools)
-s, --use-symbolic-links
Enable symbolic link support. Deprecated option; use
--symbolic-links instead.
@@ -861,7 +860,6 @@ old-style-user-limits FALSE
optimizer-prune-level 1
optimizer-search-depth 62
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on
-optimizer-use-mrr force
partition ON
plugin-load (No default value)
port 3306
=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c 2009-12-13 09:11:54 +0000
+++ b/mysys/my_getopt.c 2009-12-15 15:14:18 +0000
@@ -1276,8 +1276,9 @@ void my_print_help(const struct my_optio
{
if (optp->def_value != 0)
{
- printf("%*s(Defaults to on; use --skip-%s to disable.)\n",
- name_space, "", optp->name);
+ printf("%*s(Defaults to on; use --skip-", name_space, "");
+ print_name(optp);
+ printf(" to disable.)\n");
}
}
}
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h 2009-12-10 12:43:53 +0000
+++ b/sql/sql_class.h 2009-12-15 15:14:18 +0000
@@ -372,13 +372,6 @@ typedef struct system_variables
uint binlog_format; ///< binlog format for this thd (see enum_binlog_format)
uint completion_type;
- /**
- Controls use of Engine-MRR:
- 0 - auto, based on cost
- 1 - force MRR when the storage engine is capable of doing it
- 2 - disable MRR.
- */
- uint optimizer_use_mrr;
uint query_cache_type;
uint tx_isolation;
uint updatable_views_with_limit;
=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc 2009-12-14 21:41:58 +0000
+++ b/sql/sys_vars.cc 2009-12-15 15:14:18 +0000
@@ -40,7 +40,7 @@
static Sys_var_ulong Sys_auto_increment_increment(
"auto_increment_increment",
- "Auto-increment columns are incremented by this.",
+ "Auto-increment columns are incremented by this",
SESSION_VAR(auto_increment_increment),
CMD_LINE(OPT_ARG),
VALID_RANGE(1, 65535), DEFAULT(1), BLOCK_SIZE(1),
@@ -49,7 +49,7 @@ static Sys_var_ulong Sys_auto_increment_
static Sys_var_ulong Sys_auto_increment_offset(
"auto_increment_offset",
"Offset added to Auto-increment columns. Used when "
- "auto-increment-increment != 1.",
+ "auto-increment-increment != 1",
SESSION_VAR(auto_increment_offset),
CMD_LINE(OPT_ARG),
VALID_RANGE(1, 65535), DEFAULT(1), BLOCK_SIZE(1),
@@ -57,20 +57,20 @@ static Sys_var_ulong Sys_auto_increment_
static Sys_var_mybool Sys_automatic_sp_privileges(
"automatic_sp_privileges",
- "Creating and dropping stored procedures alters ACLs.",
+ "Creating and dropping stored procedures alters ACLs",
GLOBAL_VAR(sp_automatic_privileges),
CMD_LINE(OPT_ARG), DEFAULT(TRUE));
static Sys_var_ulong Sys_back_log(
"back_log", "The number of outstanding connection requests "
"MySQL can have. This comes into play when the main MySQL thread "
- "gets very many connection requests in a very short time.",
+ "gets very many connection requests in a very short time",
READ_ONLY GLOBAL_VAR(back_log), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1, 65535), DEFAULT(50), BLOCK_SIZE(1));
static Sys_var_charptr Sys_basedir(
"basedir", "Path to installation directory. All paths are "
- "usually resolved relative to this.",
+ "usually resolved relative to this",
READ_ONLY GLOBAL_VAR(mysql_home_ptr), CMD_LINE(REQUIRED_ARG, 'b'),
IN_FS_CHARSET, DEFAULT(0));
@@ -78,7 +78,7 @@ static Sys_var_ulong Sys_binlog_cache_si
"binlog_cache_size", "The size of the cache to "
"hold the SQL statements for the binary log during a "
"transaction. If you often use big, multi-statement "
- "transactions you can increase this to get more performance.",
+ "transactions you can increase this to get more performance",
GLOBAL_VAR(binlog_cache_size),
CMD_LINE(REQUIRED_ARG),
VALID_RANGE(IO_SIZE, ULONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE));
@@ -134,14 +134,14 @@ static bool fix_binlog_format_after_upda
static Sys_var_enum Sys_binlog_format(
"binlog_format", "What form of binary logging the master will "
- "use: either 'row' for row-based binary logging, or 'statement' "
- "for statement-based binary logging, or 'mixed'. 'mixed' is statement-"
+ "use: either ROW for row-based binary logging, STATEMENT "
+ "for statement-based binary logging, or MIXED. MIXED is statement-"
"based binary logging except for those statements where only row-"
"based is correct: those which involve user-defined functions (i.e. "
"UDFs) or the UUID() function; for those, row-based binary logging is "
- "automatically used. If NDBCLUSTER is enabled and binlog_format is "
- "'mixed', the format switches to 'row' and back implicitly per each "
- "query accessing an NDBCLUSTER table.",
+ "automatically used. If NDBCLUSTER is enabled and binlog-format is "
+ "MIXED, the format switches to row-based and back implicitly per each "
+ "query accessing an NDBCLUSTER table",
SESSION_VAR(binlog_format), CMD_LINE(REQUIRED_ARG, OPT_BINLOG_FORMAT),
binlog_format_names, DEFAULT(BINLOG_FORMAT_STMT),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(binlog_format_check),
@@ -154,7 +154,7 @@ static Sys_var_ulong Sys_bulk_insert_buf
VALID_RANGE(0, ULONG_MAX), DEFAULT(8192*1024), BLOCK_SIZE(1));
static Sys_var_charptr Sys_character_sets_dir(
- "character_sets_dir", "Directory where character sets are.",
+ "character_sets_dir", "Directory where character sets are",
READ_ONLY GLOBAL_VAR(charsets_dir), CMD_LINE(REQUIRED_ARG),
IN_FS_CHARSET, DEFAULT(0));
@@ -205,7 +205,7 @@ static Sys_var_struct Sys_character_set_
offsetof(CHARSET_INFO, csname), DEFAULT(0));
static Sys_var_struct Sys_character_set_server(
- "character_set_server", "The default character set.",
+ "character_set_server", "The default character set",
SESSION_VAR(collation_server), NO_CMD_LINE,
offsetof(CHARSET_INFO, csname), DEFAULT(&default_charset_info),
NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_charset_not_null));
@@ -220,7 +220,7 @@ static bool check_charset_db(sys_var *se
}
static Sys_var_struct Sys_character_set_database(
"character_set_database",
- " The character set used by the default database.",
+ " The character set used by the default database",
SESSION_VAR(collation_database), NO_CMD_LINE,
offsetof(CHARSET_INFO, csname), DEFAULT(&default_charset_info),
NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_charset_db));
@@ -244,7 +244,7 @@ static bool fix_thd_charset(sys_var *sel
}
static Sys_var_struct Sys_character_set_client(
"character_set_client", "The character set for statements "
- "that arrive from the client.",
+ "that arrive from the client",
SESSION_VAR(character_set_client), NO_CMD_LINE,
offsetof(CHARSET_INFO, csname), DEFAULT(&default_charset_info),
NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_cs_client),
@@ -253,7 +253,7 @@ static Sys_var_struct Sys_character_set_
static Sys_var_struct Sys_character_set_connection(
"character_set_connection", "The character set used for "
"literals that do not have a character set introducer and for "
- "number-to-string conversion.",
+ "number-to-string conversion",
SESSION_VAR(collation_connection), NO_CMD_LINE,
offsetof(CHARSET_INFO, csname), DEFAULT(&default_charset_info),
NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_charset_not_null),
@@ -261,13 +261,13 @@ static Sys_var_struct Sys_character_set_
static Sys_var_struct Sys_character_set_results(
"character_set_results", "The character set used for returning "
- "query results to the client.",
+ "query results to the client",
SESSION_VAR(character_set_results), NO_CMD_LINE,
offsetof(CHARSET_INFO, csname), DEFAULT(&default_charset_info),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_charset));
static Sys_var_struct Sys_character_set_filesystem(
- "character_set_filesystem", "The filesystem character set.",
+ "character_set_filesystem", "The filesystem character set",
SESSION_VAR(character_set_filesystem), NO_CMD_LINE,
offsetof(CHARSET_INFO, csname), DEFAULT(&character_set_filesystem),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_charset_not_null),
@@ -311,7 +311,7 @@ static bool check_collation_not_null(sys
}
static Sys_var_struct Sys_collation_connection(
"collation_connection", "The collation of the connection "
- "character set.",
+ "character set",
SESSION_VAR(collation_connection), NO_CMD_LINE,
offsetof(CHARSET_INFO, name), DEFAULT(&default_charset_info),
NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_collation_not_null),
@@ -327,13 +327,13 @@ static bool check_collation_db(sys_var *
}
static Sys_var_struct Sys_collation_database(
"collation_database", "The collation of the database "
- "character set.",
+ "character set",
SESSION_VAR(collation_database), NO_CMD_LINE,
offsetof(CHARSET_INFO, name), DEFAULT(&default_charset_info),
NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_collation_db));
static Sys_var_struct Sys_collation_server(
- "collation_server", "The server default collation.",
+ "collation_server", "The server default collation",
SESSION_VAR(collation_server), NO_CMD_LINE,
offsetof(CHARSET_INFO, name), DEFAULT(&default_charset_info),
NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_collation_not_null));
@@ -348,18 +348,18 @@ static Sys_var_enum Sys_concurrent_inser
static Sys_var_ulong Sys_connect_timeout(
"connect_timeout",
"The number of seconds the mysqld server is waiting for a connect "
- "packet before responding with 'Bad handshake'.",
+ "packet before responding with 'Bad handshake'",
GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(2, LONG_TIMEOUT), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1));
static Sys_var_charptr Sys_datadir(
- "datadir", "Path to the database root directory.",
+ "datadir", "Path to the database root directory",
READ_ONLY GLOBAL_VAR(mysql_real_data_home_ptr),
CMD_LINE(REQUIRED_ARG, 'h'), IN_FS_CHARSET, DEFAULT(0));
#ifndef DBUG_OFF
static Sys_var_dbug Sys_dbug(
- "debug", "Debug log.", sys_var::SESSION,
+ "debug", "Debug log", sys_var::SESSION,
CMD_LINE(OPT_ARG, '#'), DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG,
ON_CHECK(check_has_super));
#endif
@@ -388,7 +388,7 @@ export bool fix_delay_key_write(sys_var
}
static const char *delay_key_write_names[]= { "OFF", "ON", "ALL", NullS };
static Sys_var_enum Sys_delay_key_write(
- "delay_key_write", "Type of DELAY_KEY_WRITE.",
+ "delay_key_write", "Type of DELAY_KEY_WRITE",
GLOBAL_VAR(delay_key_write_options), CMD_LINE(OPT_ARG),
delay_key_write_names, DEFAULT(DELAY_KEY_WRITE_ON),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
@@ -398,14 +398,14 @@ static Sys_var_ulong Sys_delayed_insert_
"delayed_insert_limit",
"After inserting delayed_insert_limit rows, the INSERT DELAYED "
"handler will check if there are any SELECT statements pending. "
- "If so, it allows these to execute before continuing.",
+ "If so, it allows these to execute before continuing",
GLOBAL_VAR(delayed_insert_limit), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_LIMIT), BLOCK_SIZE(1));
static Sys_var_ulong Sys_delayed_insert_timeout(
"delayed_insert_timeout",
"How long a INSERT DELAYED thread should wait for INSERT statements "
- "before terminating.",
+ "before terminating",
GLOBAL_VAR(delayed_insert_timeout), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(DELAYED_WAIT_TIMEOUT),
BLOCK_SIZE(1));
@@ -414,7 +414,7 @@ static Sys_var_ulong Sys_delayed_queue_s
"delayed_queue_size",
"What size queue (in rows) should be allocated for handling INSERT "
"DELAYED. If the queue becomes full, any client that does INSERT "
- "DELAYED will wait until there is room in the queue again.",
+ "DELAYED will wait until there is room in the queue again",
GLOBAL_VAR(delayed_queue_size), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_QUEUE_SIZE), BLOCK_SIZE(1));
@@ -462,7 +462,9 @@ static bool event_scheduler_update(sys_v
}
static PolyLock_mutex PLock_event_metadata(&Events::LOCK_event_metadata);
static Sys_var_enum Sys_event_scheduler(
- "event_scheduler", "Enable the event scheduler.",
+ "event_scheduler", "Enable the event scheduler. Possible values are "
+ "ON, OFF, and DISABLED (keep the event scheduler completely "
+ "deactivated, it cannot be activated run-time)",
GLOBAL_VAR(Events::opt_event_scheduler), CMD_LINE(OPT_ARG),
event_scheduler_names, DEFAULT(Events::EVENTS_OFF),
&PLock_event_metadata, NOT_IN_BINLOG,
@@ -472,19 +474,19 @@ static Sys_var_enum Sys_event_scheduler(
static Sys_var_ulong Sys_expire_logs_days(
"expire_logs_days",
"If non-zero, binary logs will be purged after expire_logs_days "
- "days; possible purges happen at startup and at binary log rotation.",
+ "days; possible purges happen at startup and at binary log rotation",
GLOBAL_VAR(expire_logs_days),
CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 99), DEFAULT(0), BLOCK_SIZE(1));
static Sys_var_mybool Sys_flush(
- "flush", "Flush MyISAM tables to disk between SQL commands.",
+ "flush", "Flush MyISAM tables to disk between SQL commands",
GLOBAL_VAR(myisam_flush),
CMD_LINE(OPT_ARG), DEFAULT(FALSE));
static Sys_var_ulong Sys_flush_time(
"flush_time",
"A dedicated thread is created to flush all tables at the "
- "given interval.",
+ "given interval",
GLOBAL_VAR(flush_time),
CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT),
DEFAULT(FLUSH_TIME), BLOCK_SIZE(1));
@@ -504,7 +506,7 @@ static bool query_cache_flush(sys_var *s
/// @todo make SESSION_VAR (usability enhancement and a fix for a race condition)
static Sys_var_charptr Sys_ft_boolean_syntax(
"ft_boolean_syntax", "List of operators for "
- "MATCH ... AGAINST ( ... IN BOOLEAN MODE).",
+ "MATCH ... AGAINST ( ... IN BOOLEAN MODE)",
GLOBAL_VAR(ft_boolean_syntax),
CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
DEFAULT(DEFAULT_FTB_SYNTAX), NO_MUTEX_GUARD,
@@ -513,7 +515,7 @@ static Sys_var_charptr Sys_ft_boolean_sy
static Sys_var_ulong Sys_ft_max_word_len(
"ft_max_word_len",
"The maximum length of the word to be included in a FULLTEXT index. "
- "Note: FULLTEXT indexes must be rebuilt after changing this variable.",
+ "Note: FULLTEXT indexes must be rebuilt after changing this variable",
READ_ONLY GLOBAL_VAR(ft_max_word_len), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(10, HA_FT_MAXCHARLEN), DEFAULT(HA_FT_MAXCHARLEN),
BLOCK_SIZE(1));
@@ -521,7 +523,7 @@ static Sys_var_ulong Sys_ft_max_word_len
static Sys_var_ulong Sys_ft_min_word_len(
"ft_min_word_len",
"The minimum length of the word to be included in a FULLTEXT index. "
- "Note: FULLTEXT indexes must be rebuilt after changing this variable.",
+ "Note: FULLTEXT indexes must be rebuilt after changing this variable",
READ_ONLY GLOBAL_VAR(ft_min_word_len), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1, HA_FT_MAXCHARLEN), DEFAULT(4), BLOCK_SIZE(1));
@@ -535,13 +537,13 @@ static Sys_var_ulong Sys_ft_query_expans
static Sys_var_charptr Sys_ft_stopword_file(
"ft_stopword_file",
- "Use stopwords from this file instead of built-in list.",
+ "Use stopwords from this file instead of built-in list",
READ_ONLY GLOBAL_VAR(ft_stopword_file), CMD_LINE(REQUIRED_ARG),
IN_FS_CHARSET, DEFAULT(0));
static Sys_var_mybool Sys_ignore_builtin_innodb(
"ignore_builtin_innodb",
- "Disable initialization of builtin InnoDB plugin.",
+ "Disable initialization of builtin InnoDB plugin",
READ_ONLY GLOBAL_VAR(opt_ignore_builtin_innodb),
CMD_LINE(OPT_ARG), DEFAULT(FALSE));
@@ -563,7 +565,7 @@ static Sys_var_lexstring Sys_init_connec
ON_CHECK(check_init_string));
static Sys_var_charptr Sys_init_file(
- "init_file", "Read SQL commands from this file at startup.",
+ "init_file", "Read SQL commands from this file at startup",
READ_ONLY GLOBAL_VAR(opt_init_file),
IF_DISABLE_GRANT_OPTIONS(NO_CMD_LINE, CMD_LINE(REQUIRED_ARG)),
IN_FS_CHARSET, DEFAULT(0));
@@ -579,14 +581,14 @@ static Sys_var_lexstring Sys_init_slave(
static Sys_var_ulong Sys_interactive_timeout(
"interactive_timeout",
"The number of seconds the server waits for activity on an interactive "
- "connection before closing it.",
+ "connection before closing it",
SESSION_VAR(net_interactive_timeout),
CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
static Sys_var_ulong Sys_join_buffer_size(
"join_buffer_size",
- "The size of the buffer that is used for full joins.",
+ "The size of the buffer that is used for full joins",
SESSION_VAR(join_buff_size), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(128, ULONG_MAX), DEFAULT(128*1024), BLOCK_SIZE(128));
@@ -1122,14 +1124,6 @@ static Sys_var_flagset Sys_optimizer_swi
SESSION_VAR(optimizer_switch), CMD_LINE(REQUIRED_ARG),
optimizer_switch_names, DEFAULT(OPTIMIZER_SWITCH_DEFAULT));
-static const char *optimizer_use_mrr_names[] = {"auto", "force", "disable", 0};
-static Sys_var_enum Sys_optimizer_use_mrr(
- "optimizer_use_mrr",
- "Controls whether the optimizer uses the Multi-Range Read (MRR) "
- "access method",
- SESSION_VAR(optimizer_use_mrr), CMD_LINE(REQUIRED_ARG),
- optimizer_use_mrr_names, DEFAULT(1));
-
static Sys_var_charptr Sys_pid_file(
"pid_file", "Pid file used by safe_mysqld",
READ_ONLY GLOBAL_VAR(pidfile_name_ptr), CMD_LINE(REQUIRED_ARG),
@@ -1142,12 +1136,12 @@ static Sys_var_charptr Sys_plugin_dir(
static Sys_var_uint Sys_port(
"port",
- "Port number to use for connection or 0 for default to, in "
- "order of preference, my.cnf, $MYSQL_TCP_PORT, "
+ "Port number to use for connection or 0 to default to, "
+ "my.cnf, $MYSQL_TCP_PORT, "
#if MYSQL_PORT_DEFAULT == 0
"/etc/services, "
#endif
- "built-in default (" STRINGIFY_ARG(MYSQL_PORT) ")",
+ "built-in default (" STRINGIFY_ARG(MYSQL_PORT) "), whatever comes first",
READ_ONLY GLOBAL_VAR(mysqld_port), CMD_LINE(REQUIRED_ARG, 'P'),
VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1));
@@ -1377,7 +1371,7 @@ static Sys_var_charptr Sys_tmpdir(
#else
"colon (:)"
#endif
- ", in this case they are used in a round-robin fashion.",
+ ", in this case they are used in a round-robin fashion",
READ_ONLY GLOBAL_VAR(opt_mysql_tmpdir), CMD_LINE(REQUIRED_ARG, 't'),
IN_FS_CHARSET, DEFAULT(0));
@@ -1653,9 +1647,8 @@ export bool sql_mode_string_representati
*/
static Sys_var_set Sys_sql_mode(
"sql_mode",
- "Syntax: sql-mode=option[,option[,option...]] where 'option' can be "
- "one of: REAL_AS_FLOAT, PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, "
- "ONLY_FULL_GROUP_BY, NO_UNSIGNED_SUBTRACTION",
+ "Syntax: sql-mode=mode[,mode[,mode...]]. See the manual for the "
+ "complete list of valid sql modes",
SESSION_VAR(sql_mode), CMD_LINE(REQUIRED_ARG),
sql_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
ON_CHECK(check_sql_mode), ON_UPDATE(fix_sql_mode));
@@ -1673,7 +1666,7 @@ static Sys_var_charptr Sys_ssl_capath(
CMD_LINE(REQUIRED_ARG, OPT_SSL_CAPATH), IN_FS_CHARSET, DEFAULT(0));
static Sys_var_charptr Sys_ssl_cert(
- "ssl_cert", "X509 cert in PEM format (implies --ssl).",
+ "ssl_cert", "X509 cert in PEM format (implies --ssl)",
READ_ONLY GLOBAL_VAR(opt_ssl_cert), CMD_LINE(REQUIRED_ARG, OPT_SSL_CERT),
IN_FS_CHARSET, DEFAULT(0));
@@ -1695,7 +1688,7 @@ static Sys_var_enum Sys_updatable_views_
"presence of a key of the underlying table is used in queries with a "
"LIMIT clause for updating. NO = Prohibit update of a VIEW, which "
"does not contain a key of the underlying table and the query uses "
- "a LIMIT clause (usually get from GUI tools).",
+ "a LIMIT clause (usually get from GUI tools)",
SESSION_VAR(updatable_views_with_limit), CMD_LINE(REQUIRED_ARG),
updatable_views_with_limit_names, DEFAULT(TRUE));
@@ -1868,19 +1861,19 @@ static Sys_var_debug_sync Sys_debug_sync
@todo make them NO_CMD_LINE ?
*/
static Sys_var_charptr Sys_date_format(
- "date_format", "The DATE format (for future)",
+ "date_format", "The DATE format (ignored)",
READ_ONLY GLOBAL_VAR(global_date_format.format.str),
CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
DEFAULT(known_date_time_formats[ISO_FORMAT].date_format));
static Sys_var_charptr Sys_datetime_format(
- "datetime_format", "The DATETIME format (for future)",
+ "datetime_format", "The DATETIME format (ignored)",
READ_ONLY GLOBAL_VAR(global_datetime_format.format.str),
CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
DEFAULT(known_date_time_formats[ISO_FORMAT].datetime_format));
static Sys_var_charptr Sys_time_format(
- "time_format", "The TIME format (for future)",
+ "time_format", "The TIME format (ignored)",
READ_ONLY GLOBAL_VAR(global_time_format.format.str),
CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
DEFAULT(known_date_time_formats[ISO_FORMAT].time_format));
@@ -2211,7 +2204,7 @@ static Sys_var_ulong Sys_default_week_fo
static Sys_var_ulong Sys_group_concat_max_len(
"group_concat_max_len",
- "The maximum length of the result of function group_concat",
+ "The maximum length of the result of function GROUP_CONCAT()",
SESSION_VAR(group_concat_max_len), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(4, ULONG_MAX), DEFAULT(1024), BLOCK_SIZE(1));
@@ -2429,23 +2422,25 @@ 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 file",
+ "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"
+ "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),
ON_UPDATE(fix_log_state));
// Synonym of "general_log" for consistency with SHOW VARIABLES output
static Sys_var_mybool Sys_log(
- "log", "Log connections and queries to file",
+ "log", "Alias for --general-log. Deprecated",
GLOBAL_VAR(opt_log), NO_CMD_LINE,
DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_log_state), DEPRECATED(70000, "'@@general_log'"));
static Sys_var_mybool Sys_slow_query_log(
"slow_query_log",
- "Log slow queries to a table or log file. Defaults logging to table "
- "mysql.slow_log or hostname-slow.log if --log-output=file is used. "
- "Must be enabled to activate other slow log options",
+ "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",
GLOBAL_VAR(opt_slow_log), CMD_LINE(OPT_ARG),
DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_log_state));
@@ -2453,7 +2448,7 @@ static Sys_var_mybool Sys_slow_query_log
/* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */
static Sys_var_mybool Sys_log_slow(
"log_slow_queries",
- "Log slow queries to a table or log file",
+ "Alias for --slow-query-log. Deprecated",
GLOBAL_VAR(opt_slow_log), NO_CMD_LINE,
DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_log_state), DEPRECATED(70000, "'@@slow_query_log'"));
Attachment: [text/bzr-bundle] bzr/serg@mysql.com-20091215151418-eh5mdjw42htuzok2.bundle
| Thread |
|---|
| • bzr commit into mysql-5.6-next-mr branch (serg:2955) | Sergei Golubchik | 15 Dec |
