| List: | Commits | « Previous MessageNext Message » | |
| From: | mcbrown | Date: | September 18 2006 12:31pm |
| Subject: | svn commit - mysqldoc@docsrva: r3386 - trunk/mysqld-optvars | ||
| View as plain text | |||
Author: mcbrown Date: 2006-09-18 12:31:47 +0200 (Mon, 18 Sep 2006) New Revision: 3386 Log: Some commandline/my.cnf updates Modified: trunk/mysqld-optvars/options.xml Modified: trunk/mysqld-optvars/options.xml =================================================================== --- trunk/mysqld-optvars/options.xml 2006-09-18 09:18:59 UTC (rev 3385) +++ trunk/mysqld-optvars/options.xml 2006-09-18 10:31:47 UTC (rev 3386) Changed blocks: 274, Lines Added: 1199, Lines Deleted: 974; 174463 bytes @@ -1,22 +1,5 @@ -<!DOCTYPE mysqloptions SYSTEM -"options.dtd"> +<!DOCTYPE mysqloptions SYSTEM "options.dtd"> <mysqloptions> - <mysqloption id="Aborted_clients"> - <name>Aborted_clients</name> - <shortdescription lang="en">The number of connections aborted because the - client died without closing the connection properly</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype isdynamic="no" class="status" type="both"/> - </types> - <versions> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="Aborted_connects"> <name>Aborted_connects</name> <shortdescription lang="en">The number of failed attempts to connecto the @@ -2858,23 +2841,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="autocommit"> - <name>autocommit</name> - <shortdescription lang="en">Sets the autocommit mode.</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype isdynamic="yes" class="server" type="session"/> - </types> - <values vartype="boolean" platform="all"> </values> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="auto-increment-increment"> <name>auto-increment-increment</name> <shortdescription lang="en">Auto-increment columns are incremented by this @@ -2887,6 +2853,7 @@ <types> <optype class="cmdline" format="--auto-increment-increment[=#]" setvar="auto-increment-increment"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="yes"/> </types> <values vartype="numeric" platform="all"> @@ -2908,6 +2875,7 @@ <types> <optype class="cmdline" format="--auto-increment-offset[=#]" setvar="auto-increment-offset"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="yes"/> </types> <values vartype="numeric" platform="all"> @@ -2918,6 +2886,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="autocommit"> + <name>autocommit</name> + <shortdescription lang="en">Sets the autocommit mode.</shortdescription> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype isdynamic="yes" class="server" type="session"/> + </types> + <values vartype="boolean" platform="all"> </values> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="automatic-sp-privileges"> <name>automatic-sp-privileges</name> <shortdescription lang="en">Creating and dropping stored procedures alters @@ -2930,6 +2915,7 @@ <types> <optype class="cmdline" format="--automatic-sp-privileges" setvar="automatic-sp-privileges"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="yes"/> </types> <values vartype="boolean" platform="all"> @@ -2950,6 +2936,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--back_log=#" setvar="back_log"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="yes"/> </types> <values vartype="numeric" platform="all"> @@ -2984,16 +2971,18 @@ <mysqloption id="bdb"> <name>bdb</name> <shortdescription lang="en">Enable Berkeley DB (if this version of MySQL - supports it). Disable with --skip-bdb (will save memory)</shortdescription> + supports it).</shortdescription> <section id="mysqld"/> <opclass class="bdb"/> <engines> <engine engine="bdb"/> </engines> <platforms applies="all"/> + <disabledby xref="skip-bdb"/> <types> <optype class="cmdline" format="--bdb" outversion="5.1.12" setvar="have_bdb"/> + <optype class="mycnf"/> <vartype class="server" format="have_bdb" outversion="5.1.12" isdynamic="no"/> </types> @@ -3018,6 +3007,7 @@ <types> <optype class="cmdline" format="--bdb-home=name" outversion="5.1.12" setvar="bdb_home"/> + <optype class="mycnf"/> <vartype class="server" format="bdb_home" outversion="5.1.12" isdynamic="no"/> </types> @@ -3039,6 +3029,7 @@ <types> <optype class="cmdline" format="--bdb-lock-detect=name" outversion="5.1.12"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -3058,6 +3049,7 @@ <types> <optype class="cmdline" format="--bdb-logdir=name" outversion="5.1.12" setvar="bdb_logdir"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="no" format="bdb_logdir" outversion="5.1.12"/> </types> @@ -3078,6 +3070,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--bdb-no-recover" outversion="5.1.12"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -3097,6 +3090,7 @@ <deprecated version="5.0.24" xref="skip-sync-bdb-logs"/> <types> <optype class="cmdline" format="--bdb-no-sync" outversion="5.1.12"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -3104,26 +3098,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="skip-sync-bdb-logs"> - <name>skip-sync-bdb-logs</name> - <shortdescription lang="en">Disables synchronous BDB log flushes</shortdescription> - <section id="mysqld"/> - <opclass class="bdb"/> - <engines> - <engine engine="bdb"/> - </engines> - <platforms applies="all"/> - <seealso xref="bdb-no-sync"/> - <types> - <optype class="cmdline" format="--skip-sync-bdb-logs" outversion="5.1.12" - /> - </types> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="bdb-shared-data"> <name>bdb-shared-data</name> <shortdescription lang="en">Start Berkeley DB in multi-process mode</shortdescription> @@ -3267,6 +3241,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--big-tables" setvar="big_tables"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="yes" type="session"/> </types> <values vartype="boolean" platform="all"/> @@ -3283,6 +3258,7 @@ <opclass class="server"/> <types> <optype class="cmdline" format="--bind-address=name" setvar="bind-address"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="no"/> </types> <versions> @@ -3300,6 +3276,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--binlog-do-db=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -3317,6 +3294,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--binlog-ignore-db=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -3351,6 +3329,7 @@ <types> <optype class="cmdline" format="--binlog_cache_size=#" setvar="binlog_cache_size"/> + <optype class="mycnf"/> <vartype class="server" type="global" isdynamic="yes"/> </types> <values vartype="numeric" platform="all"/> @@ -3360,6 +3339,32 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="binlog_format"> + <name>Binlog format</name> + <shortdescription lang="en">Specifies the format of the binary log</shortdescription> + <section id="mysqld"/> + <opclass class="binlog"/> + <opclass class="replication"/> + <engines includes="all"/> + <platforms applies="all"/> + <seealso xref="log-bin-trust-function-creators"/> + <seealso xref="innodb_locks_unsafe_for_binlog"/> + <types> + <optype class="mycnf" format="binlog-format" setvar="binlog_format"/> + <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--binlog-format" setvar="binlog_format"/> + </types> + <values vartype="string" platform="all"> + <value default="row"/> + <choice value="row"/> + <choice value="statement"/> + <choice value="mixed"/> + </values> + <versions> + <introduced version="5.1.5"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="bootstrap"> <name>bootstrap</name> <shortdescription lang="en">Used by mysql installation scripts. </shortdescription> @@ -3387,6 +3392,7 @@ <types> <optype class="cmdline" format="--bulk_insert_buffer_size=#" setvar="bulk_insert_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"/> @@ -3396,77 +3402,86 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character_set_client"> - <name>character_set_client</name> - <shortdescription lang="en">Current client character set</shortdescription> + <mysqloption id="character-set-client-handshake"> + <name>character-set-client-handshake</name> + <shortdescription lang="en">Don't ignore client side character set value + sent during handshake</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <seealso xref="skip-character-set-client-handshake"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--character-set-client-handshake" + setvar="character-set-client-handshake"/> </types> - <values vartype="string" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character_set_connection"> - <name>character_set_connection</name> - <shortdescription lang="en">Current connection character set</shortdescription> + <mysqloption id="character-set-filesystem"> + <name>character-set-filesystem</name> + <shortdescription lang="en">Set the filesystem character set</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--character-set-filesystem=name" + setvar="character-set-filesystem"/> + <optype class="mycnf"/> + <vartype class="server" format="character_set_filesystem" isdynamic="yes" + /> </types> - <values vartype="string" platform="all"/> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character_set_filesystem"> - <name>character_set_client</name> - <shortdescription lang="en">Current filesystem character set</shortdescription> + <mysqloption id="character-set-server"> + <name>character-set-server</name> + <shortdescription lang="en">instead). --default-collation=name Set the + default collation (deprecated option, use</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--character-set-server" + setvar="character_set_server"/> + <optype class="mycnf"/> + <vartype class="server" format="character_set_server" isdynamic="yes"/> </types> - <values vartype="string" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character_set_results"> - <name>character_set_client</name> - <shortdescription lang="en">Current result character set</shortdescription> + <mysqloption id="character-sets-dir"> + <name>character-sets-dir</name> + <shortdescription lang="en">Directory where character sets are</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--character-sets-dir=name" + setvar="character-sets-dir"/> + <optype class="mycnf"/> + <vartype class="server" format="character_sets_dir" isdynamic="no"/> </types> - <values vartype="string" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character_set_server"> + <mysqloption id="character_set_client"> <name>character_set_client</name> - <shortdescription lang="en">Current server character set</shortdescription> + <shortdescription lang="en">Current client character set</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -3481,74 +3496,68 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character-set-client-handshake"> - <name>character-set-client-handshake</name> - <shortdescription lang="en">Don't ignore client side character set value - sent during handshake</shortdescription> + <mysqloption id="character_set_connection"> + <name>character_set_connection</name> + <shortdescription lang="en">Current connection character set</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> - <seealso xref="skip-character-set-client-handshake"/> <types> - <optype class="cmdline" format="--character-set-client-handshake" - setvar="character-set-client-handshake"/> + <vartype class="server" isdynamic="yes" type="both"/> </types> + <values vartype="string" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character-set-filesystem"> - <name>character-set-filesystem</name> - <shortdescription lang="en">Set the filesystem character set</shortdescription> + <mysqloption id="character_set_filesystem"> + <name>character_set_client</name> + <shortdescription lang="en">Current filesystem character set</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--character-set-filesystem=name" - setvar="character-set-filesystem"/> - <vartype class="server" format="character_set_filesystem" isdynamic="yes" - /> + <vartype class="server" isdynamic="yes" type="both"/> </types> + <values vartype="string" platform="all"/> <versions> + <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character-set-server"> - <name>character-set-server</name> - <shortdescription lang="en">instead). --default-collation=name Set the - default collation (deprecated option, use</shortdescription> + <mysqloption id="character_set_results"> + <name>character_set_client</name> + <shortdescription lang="en">Current result character set</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--character-set-server" - setvar="character_set_server"/> - <vartype class="server" format="character_set_server" isdynamic="yes"/> + <vartype class="server" isdynamic="yes" type="both"/> </types> + <values vartype="string" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character-sets-dir"> - <name>character-sets-dir</name> - <shortdescription lang="en">Directory where character sets are</shortdescription> + <mysqloption id="character_set_server"> + <name>character_set_client</name> + <shortdescription lang="en">Current server character set</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--character-sets-dir=name" - setvar="character-sets-dir"/> - <vartype class="server" format="character_sets_dir" isdynamic="no"/> + <vartype class="server" isdynamic="yes" type="both"/> </types> + <values vartype="string" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> @@ -3567,7 +3576,6 @@ <optype class="cmdline" format="--chroot=name"/> <optype class="cmdline" format="-r"/> <optype class="mycnf"/> - <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -3765,8 +3773,7 @@ </mysqloption> <mysqloption id="default-character-set"> <name>default-character-set</name> - <shortdescription lang="en">Set the default character set (deprecated - option, use</shortdescription> + <shortdescription lang="en">Set the default character set </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -3787,8 +3794,7 @@ </mysqloption> <mysqloption id="default-collation"> <name>default-collation</name> - <shortdescription lang="en">Set the default collation (deprecated option, - use</shortdescription> + <shortdescription lang="en">Set the default collation </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -3824,12 +3830,12 @@ </mysqloption> <mysqloption id="default-table-type"> <name>default-table-type</name> - <shortdescription lang="en">Use --default-storage-engine. </shortdescription> + <shortdescription lang="en">Deprecated. </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> - <deprecated version="5.0"/> + <deprecated version="5.0" xref="default-storage-engine"/> <types> <optype class="cmdline" format="--default-table-type=name"/> <optype class="mycnf"/> @@ -3868,6 +3874,7 @@ <types> <optype class="cmdline" format="--default_week_format=#" setvar="default_week_format"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"/> @@ -3884,6 +3891,7 @@ <opclass class="server"/> <types> <optype class="cmdline" format="--defaults-extra-file=#"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -3898,6 +3906,7 @@ <opclass class="server"/> <types> <optype class="cmdline" format="--defaults-file=#"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -3915,6 +3924,7 @@ <types> <optype class="cmdline" format="--delay-key-write[=name]" setvar="delay_key_write"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="yes" type="global"/> </types> <values vartype="string" platform="all"> @@ -3931,11 +3941,12 @@ <mysqloption id="delay-key-write-for-all-tables"> <name>delay-key-write-for-all-tables</name> <shortdescription lang="en">Don't flush key buffers between writes for any - MyISAM table (Deprecated option, use --delay-key-write=all instead)</shortdescription> + MyISAM table</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <deprecated version="5.0" xref="delay-key-write"/> <types> <optype class="cmdline" format="--delay-key-write-for-all-tables"/> </types> @@ -3957,6 +3968,7 @@ <types> <optype class="cmdline" format="--delayed_insert_limit=#" setvar="delayed_insert_limit"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"/> @@ -3977,6 +3989,7 @@ <types> <optype class="cmdline" format="--delayed_insert_timeout=#" setvar="delayed_insert_timeout"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"/> @@ -3997,6 +4010,7 @@ <types> <optype class="cmdline" format="--delayed_queue_size=#" setvar="delayed_queue_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"/> @@ -4055,6 +4069,7 @@ <types> <optype class="cmdline" format="--div_precision_increment=#" setvar="div_precision_increment"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"/> @@ -4072,7 +4087,7 @@ <engines includes="all"/> <platforms applies="all"/> <seealso xref="external-locking"/> - <deprecated version="4.0.3"/> + <deprecated version="4.0.3" xref="external-locking"/> <types> <optype class="cmdline" format="--enable-locking" setvar="enable-locking" /> @@ -4148,6 +4163,7 @@ <types> <optype class="cmdline" format="--event-scheduler=#" setvar="event_scheduler" inversion="5.1.6"/> + <optype class="mycnf"/> <vartype class="server" format="event_scheduler" isdynamic="yes"/> </types> <versions> @@ -4155,6 +4171,23 @@ <introduced version="5.1.6"/> </versions> </mysqloption> + <mysqloption id="event_scheduler"> + <name>event_scheduler</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="boolean" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="exit-info"> <name>exit-info</name> <shortdescription lang="en">Used for debugging; Use at your own risk!</shortdescription> @@ -4185,6 +4218,7 @@ <types> <optype class="cmdline" format="--expire_logs_days=#" setvar="expire_logs_days"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"/> @@ -4213,25 +4247,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="skip-external-locking"> - <name>skip-external-locking</name> - <shortdescription lang="en">Skip system (external) locking</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <seealso xref="external-locking"/> - <types> - <optype class="cmdline" format="--skip-external-locking" - setvar="external-locking"/> - <optype class="mycnf"/> - </types> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="flush"> <name>flush</name> <shortdescription lang="en">Flush tables to disk between SQL commands</shortdescription> @@ -4261,6 +4276,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--flush_time=#" setvar="flush_time"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"/> @@ -4270,6 +4286,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="foreign_key_checks"> + <name>foreign_key_checks</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="session"/> + </types> + <values vartype="boolean" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="ft_boolean_syntax"> <name>ft_boolean_syntax</name> <shortdescription lang="en">List of operators for MATCH ... AGAINST ( ... IN @@ -4280,6 +4313,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--ft_boolean_syntax=name"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"/> @@ -4301,6 +4335,7 @@ <types> <optype class="cmdline" format="--ft_max_word_len=#" setvar="ft_max_word_len"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -4320,6 +4355,7 @@ <types> <optype class="cmdline" format="--ft_min_word_len=#" setvar="ft_min_word_len"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -4339,6 +4375,7 @@ <types> <optype class="cmdline" format="--ft_query_expansion_limit=#" setvar="ft_query_expansion_limit"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -4358,6 +4395,7 @@ <types> <optype class="cmdline" format="--ft_stopword_file=name" setvar="ft_stopword_file"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -4409,6 +4447,7 @@ <types> <optype class="cmdline" format="--group_concat_max_len=#" setvar="group_concat_max_len"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"/> @@ -4438,6 +4477,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="identity"> + <name>identity</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="session"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="init-connect"> <name>init-connect</name> <shortdescription lang="en">Command(s) that are executed for each new @@ -4503,6 +4559,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--init-slave=name" setvar="init_slave"/> + <optype class="mycnf"/> <vartype class="server" format="init_slave" isdynamic="no"/> </types> <versions> @@ -4541,6 +4598,7 @@ <types> <optype class="cmdline" format="--innodb_additional_mem_pool_size=#" setvar="innodb_additional_mem_pool_size"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="no"/> </types> <versions> @@ -4559,6 +4617,7 @@ <types> <optype class="cmdline" format="--innodb_autoextend_increment=#" setvar="innodb_autoextend_increment"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="yes" type="global"/> </types> <values vartype="numeric" platform="all"/> @@ -4579,6 +4638,7 @@ <types> <optype class="cmdline" format="--innodb_buffer_pool_awe_mem_mb=#" setvar="innodb_buffer_pool_awe_mem_mb"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="no"/> </types> <versions> @@ -4598,6 +4658,7 @@ <types> <optype class="cmdline" format="--innodb_buffer_pool_size=#" setvar="innodb_buffer_pool_size"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="no"/> </types> <versions> @@ -4617,6 +4678,7 @@ <types> <optype class="cmdline" format="--innodb_checksums" setvar="innodb_checksums"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -4635,6 +4697,7 @@ <types> <optype class="cmdline" format="--innodb_commit_concurrency=#" setvar="innodb_commit_concurrency"/> + <optype class="mycnf"/> <vartype class="server" type="global" isdynamic="yes"/> </types> <values vartype="numeric" platform="all"/> @@ -4654,6 +4717,7 @@ <types> <optype class="cmdline" format="--innodb_concurrency_tickets=#" setvar="innodb_concurrency_tickets"/> + <optype class="mycnf"/> <vartype class="server" type="global" isdynamic="yes"/> </types> <values vartype="numeric" platform="all"/> @@ -4671,6 +4735,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--innodb_data_file_path=name"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="no"/> </types> <versions> @@ -4689,6 +4754,7 @@ <types> <optype class="cmdline" format="--innodb_data_home_dir=name" setvar="innodb_data_home_dir"/> + <optype class="mycnf"/> <vartype class="server" isdynamic="no"/> </types> <versions> @@ -4708,6 +4774,7 @@ <types> <optype class="cmdline" format="--innodb_doublewrite" setvar="innodb_doublewrite"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -4718,23 +4785,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="skip-innodb-doublewrite"> - <name>skip-innodb-doublewrite</name> - <shortdescription lang="en">Disable InnoDB doublewrite buffer</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <seealso xref="innodb_doublewrite"/> - <types> - <optype class="cmdline" format="--skip-innodb-doublewrite" - setvar="innodb_doublewrite"/> - </types> - <versions> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="innodb_fast_shutdown"> <name>innodb_fast_shutdown</name> <shortdescription lang="en">Speeds up the shutdown process of the InnoDB @@ -4747,6 +4797,7 @@ <types> <optype class="cmdline" format="--innodb_fast_shutdown[=#]" setvar="innodb_fast_shutdown"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -4770,6 +4821,7 @@ <types> <optype class="cmdline" format="--innodb_file_io_threads=#" setvar="innodb_file_io_threads"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -4792,6 +4844,7 @@ <types> <optype class="cmdline" format="--innodb_file_per_table" setvar="innodb_file_per_table"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -4815,6 +4868,7 @@ <types> <optype class="cmdline" format="--innodb_flush_log_at_trx_commit[=#]" setvar="innodb_flush_log_at_trx_commit"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -4838,6 +4892,7 @@ <types> <optype class="cmdline" format="--innodb_flush_method=name" setvar="innodb_flush_method"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -4857,6 +4912,7 @@ <types> <optype class="cmdline" format="--innodb_force_recovery=#" setvar="innodb_force_recovery"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -4879,6 +4935,7 @@ <types> <optype class="cmdline" format="--innodb_lock_wait_timeout=#" setvar="innodb_lock_wait_timeout"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -4901,6 +4958,7 @@ <types> <optype class="cmdline" format="--innodb_locks_unsafe_for_binlog" setvar="innodb_locks_unsafe_for_binlog"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -4922,6 +4980,7 @@ <types> <optype class="cmdline" format="--innodb_log_arch_dir=name" setvar="innodb_log_arch_dir"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -4939,6 +4998,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--innodb_log_archive[=#]"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -4957,6 +5017,7 @@ <types> <optype class="cmdline" format="--innodb_log_buffer_size=#" setvar="innodb_log_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -4978,6 +5039,7 @@ <types> <optype class="cmdline" format="--innodb_log_file_size=#" setvar="innodb_log_file_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5000,6 +5062,7 @@ <types> <optype class="cmdline" format="--innodb_log_files_in_group=#" setvar="innodb_log_files_in_group"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5021,6 +5084,7 @@ <types> <optype class="cmdline" format="--innodb_log_group_home_dir=name" setvar="innodb_log_group_home_dir"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -5039,6 +5103,7 @@ <types> <optype class="cmdline" format="--innodb_max_dirty_pages_pct=#" setvar="innodb_max_dirty_pages_pct"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -5061,6 +5126,7 @@ <types> <optype class="cmdline" format="--innodb_max_purge_lag=#" setvar="innodb_max_purge_lag"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -5083,6 +5149,7 @@ <types> <optype class="cmdline" format="--innodb_mirrored_log_groups=#" setvar="innodb_mirrored_log_groups"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5105,6 +5172,7 @@ <types> <optype class="cmdline" format="--innodb_open_files=#" setvar="innodb_open_files"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5127,6 +5195,7 @@ <types> <optype class="cmdline" format="--innodb_safe_binlog" setvar="innodb_safe_binlog"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5147,6 +5216,7 @@ <types> <optype class="cmdline" format="--innodb_status_file" setvar="innodb_status_file"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5169,6 +5239,7 @@ <types> <optype class="cmdline" format="--innodb_support_xa" setvar="innodb_support_xa"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="boolean" platform="all"> @@ -5189,6 +5260,7 @@ <types> <optype class="cmdline" format="--innodb_sync_spin_loops=#" setvar="innodb_sync_spin_loops"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -5209,6 +5281,7 @@ <types> <optype class="cmdline" format="--innodb_table_locks" setvar="innodb_table_locks"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="boolean" platform="all"> @@ -5232,6 +5305,7 @@ <types> <optype class="cmdline" format="--innodb_thread_concurrency=#" setvar="innodb_thread_concurrency"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -5254,6 +5328,7 @@ <types> <optype class="cmdline" format="--innodb_thread_sleep_delay=#" setvar="innodb_thread_sleep_delay"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -5264,6 +5339,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="insert_id"> + <name>insert_id</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="session"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="interactive_timeout"> <name>interactive_timeout</name> <shortdescription lang="en">The number of seconds the server waits for @@ -5275,6 +5367,7 @@ <types> <optype class="cmdline" format="--interactive_timeout=#" setvar="interactive_timeout"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -5296,6 +5389,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--isam" setvar="isam"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5318,6 +5412,7 @@ <types> <optype class="cmdline" format="--join_buffer_size=#" setvar="join_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -5340,6 +5435,7 @@ <types> <optype class="cmdline" format="--key_buffer_size=#" setvar="key_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -5364,6 +5460,7 @@ <types> <optype class="cmdline" format="--key_cache_age_threshold=#" setvar="key_cache_age_threshold"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5385,6 +5482,7 @@ <types> <optype class="cmdline" format="--key_cache_block_size=#" setvar="key_cache_block_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5407,6 +5505,7 @@ <types> <optype class="cmdline" format="--key_cache_division_limit=#" setvar="key_cache_division_limit"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5443,14 +5542,15 @@ </mysqloption> <mysqloption id="large-pages"> <name>large-pages</name> - <shortdescription lang="en">Enable support for large pages. Disable with - --skip-large-pages</shortdescription> + <shortdescription lang="en">Enable support for large pages. </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <disabledby xref="skip-large-pages"/> <types> <optype class="cmdline" format="--large-pages" setvar="large-pages"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5461,6 +5561,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="last_insert_id"> + <name>last_insert_id</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="session"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="local-infile"> <name>local-infile</name> <shortdescription lang="en">Enable/disable LOAD DATA LOCAL INFILE (takes @@ -5471,6 +5588,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--local-infile" setvar="local-infile"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5482,6 +5600,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="local_infile"> + <name>local_infile</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="boolean" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="log"> <name>log</name> <shortdescription lang="en">Log connections and queries to file</shortdescription> @@ -5503,13 +5638,14 @@ </mysqloption> <mysqloption id="log-bin"> <name>log-bin</name> - <shortdescription lang="en">instead</shortdescription> + <shortdescription lang="en">Enables binary log</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--log-bin" setvar="log-bin"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -5531,6 +5667,7 @@ <types> <optype class="cmdline" format="--log-bin-index=name" setvar="log-bin-index"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -5551,6 +5688,7 @@ <types> <optype class="cmdline" format="--log-bin-trust-function-creators" setvar="log-bin-trust-function-creators"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5571,6 +5709,7 @@ <types> <optype class="cmdline" format="--log-bin-trust-routine-creators" setvar="log-bin-trust-routine-creators"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5590,6 +5729,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--log-error[=name]" setvar="log-error"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -5607,6 +5747,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--log-isam[=name]" setvar="log-isam"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="filename" platform="all"> @@ -5640,15 +5781,14 @@ <mysqloption id="log-output"> <name>log-output</name> <shortdescription lang="en">Syntax: log-output[=value[,value...]], where - "value" could be TABLE, FILE or NONE. --log-queries-not-using-indexes Log - queries that are executed without benefit of any index to the slow log if - it is open</shortdescription> + "value" could be TABLE, FILE or NONE.</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--log-output[=name]" setvar="log-output"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="string" platform="all"> @@ -5672,6 +5812,7 @@ <types> <optype class="cmdline" format="--log-queries-not-using-indexes" setvar="log-queries-not-using-indexes"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5694,6 +5835,7 @@ <types> <optype class="cmdline" format="--log-short-format" setvar="log-short-format"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5715,6 +5857,7 @@ <types> <optype class="cmdline" format="--log-slave-updates" setvar="log-slave-updates"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5722,11 +5865,8 @@ </values> <versions> <manual version="4.1"/> - <manual version="4.1"/> <manual version="5.0"/> - <manual version="5.0"/> <manual version="5.1"/> - <manual version="5.1"/> </versions> </mysqloption> <mysqloption id="log-slow-admin-statements"> @@ -5740,6 +5880,7 @@ <types> <optype class="cmdline" format="--log-slow-admin-statements" setvar="log-slow-admin-statements"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -5763,6 +5904,7 @@ <types> <optype class="cmdline" format="--log-slow-queries[=name]" setvar="log-slow-queries"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -5782,6 +5924,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--log-tc=name" setvar="log-tc"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="filename" platform="all"> @@ -5801,6 +5944,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--log-tc-size=#" setvar="log-tc-size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5819,6 +5963,7 @@ <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <deprecated version="5.0" xref="log-bin"/> <types> <optype class="cmdline" format="--log-update[=name]" setvar="log-update"/> <vartype isdynamic="yes" class="server"/> @@ -5851,6 +5996,57 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="log_bin_trust_function_creators"> + <name>log_bin_trust_function_creators</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="boolean" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> + <mysqloption id="log_queries_not_using_indexes"> + <name>log_queries_not_using_indexes</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="boolean" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> + <mysqloption id="log_warnings"> + <name>log_warnings</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="long_query_time"> <name>long_query_time</name> <shortdescription lang="en">Log all queries that have taken more than @@ -5862,6 +6058,7 @@ <types> <optype class="cmdline" format="--long_query_time=#" setvar="long_query_time"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -5884,6 +6081,7 @@ <types> <optype class="cmdline" format="--low-priority-updates" setvar="low-priority-updates"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5895,6 +6093,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="low_priority_updates"> + <name>low_priority_updates</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="both"/> + </types> + <values vartype="boolean" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="lower_case_table_names"> <name>lower_case_table_names</name> <shortdescription lang="en">If set to 1 table names are stored in lowercase @@ -5907,6 +6122,7 @@ <types> <optype class="cmdline" format="--lower_case_table_names[=#]" setvar="lower_case_table_names"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5930,6 +6146,7 @@ <types> <optype class="cmdline" format="--master-connect-retry=#" setvar="master-connect-retry"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -5943,21 +6160,14 @@ </mysqloption> <mysqloption id="master-host"> <name>master-host</name> - <shortdescription lang="en">Master hostname or IP address for replication. - If not set, the slave thread will not be started. Note that the setting of - master-host will be ignored if there exists a valid master.info file. - --master-info-file=name The location and name of the file that remembers - the master and where the I/O replication thread is in the master's - binlogs. --master-password=name The password the slave thread will - authenticate with when connecting to the master. If not set, an empty - password is assumed.The value in master.info will take precedence if it - can be read</shortdescription> + <shortdescription lang="en">Master hostname or IP address for replication. </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--master-host=name" setvar="master-host"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -5977,6 +6187,7 @@ <types> <optype class="cmdline" format="--master-info-file=name" setvar="master-info-file"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="filename" platform="all"> @@ -5991,8 +6202,7 @@ <mysqloption id="master-password"> <name>master-password</name> <shortdescription lang="en">The password the slave thread will authenticate - with when connecting to the master. If not set, an empty password is - assumed.The value in master.info will take precedence if it can be read</shortdescription> + with when connecting to the master</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -6000,6 +6210,7 @@ <types> <optype class="cmdline" format="--master-password=name" setvar="master-password"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -6017,6 +6228,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--master-port=#" setvar="master-port"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -6039,6 +6251,7 @@ <types> <optype class="cmdline" format="--master-retry-count=#" setvar="master-retry-count"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -6053,19 +6266,14 @@ <mysqloption id="master-ssl"> <name>master-ssl</name> <shortdescription lang="en">Enable the slave to connect to the master using - SSL. --master-ssl-ca[=name] Master SSL CA file. Only applies if you have - enabled master-ssl. --master-ssl-capath[=name] Master SSL CA path. Only - applies if you have enabled master-ssl. --master-ssl-cert[=name] Master - SSL certificate file name. Only applies if you have enabled master-ssl - --master-ssl-cipher[=name] Master SSL cipher. Only applies if you have - enabled master-ssl. --master-ssl-key[=name] Master SSL keyfile name. Only - applies if you have enabled master-ssl</shortdescription> + SSL. </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--master-ssl" setvar="master-ssl"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -6088,6 +6296,7 @@ <types> <optype class="cmdline" format="--master-ssl-ca[=name]" setvar="master-ssl-ca"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -6107,6 +6316,7 @@ <types> <optype class="cmdline" format="--master-ssl-capath[=name]" setvar="master-ssl-capath"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -6126,6 +6336,7 @@ <types> <optype class="cmdline" format="--master-ssl-cert[=name]" setvar="master-ssl-cert"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -6145,6 +6356,7 @@ <types> <optype class="cmdline" format="--master-ssl-cipher[=name]" setvar="master-ssl-cipher"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -6164,6 +6376,7 @@ <types> <optype class="cmdline" format="--master-ssl-key[=name]" setvar="master-ssl-key"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -6186,6 +6399,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--master-user=name" setvar="master-user"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="string" platform="all"> @@ -6208,6 +6422,7 @@ <types> <optype class="cmdline" format="--max-binlog-dump-events=#" setvar="max-binlog-dump-events"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -6229,6 +6444,7 @@ <types> <optype class="cmdline" format="--max_allowed_packet=#" setvar="max_allowed_packet"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6251,6 +6467,7 @@ <types> <optype class="cmdline" format="--max_binlog_cache_size=#" setvar="max_binlog_cache_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6265,10 +6482,7 @@ <mysqloption id="max_binlog_size"> <name>max_binlog_size</name> <shortdescription lang="en">Binary log will be rotated automatically when - the size exceeds this value. Will also apply to relay logs if - max_relay_log_size is 0. The minimum value for this variable is 4096. - --max_connect_errors=# If there is more than this number of interrupted - connections from a host this host will be blocked from further connections</shortdescription> + the size exceeds this value</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -6276,6 +6490,7 @@ <types> <optype class="cmdline" format="--max_binlog_size=#" setvar="max_binlog_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6298,6 +6513,7 @@ <types> <optype class="cmdline" format="--max_connect_errors=#" setvar="max_connect_errors"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6311,10 +6527,7 @@ </mysqloption> <mysqloption id="max_connections"> <name>max_connections</name> - <shortdescription lang="en">The number of simultaneous clients allowed. - --max_delayed_threads=# Don't start more than this number of threads to - handle INSERT DELAYED statements. If set to zero, which means INSERT - DELAYED is not used</shortdescription> + <shortdescription lang="en">The number of simultaneous clients allowed</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -6322,6 +6535,7 @@ <types> <optype class="cmdline" format="--max_connections=#" setvar="max_connections"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6345,6 +6559,7 @@ <types> <optype class="cmdline" format="--max_delayed_threads=#" setvar="max_delayed_threads"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6368,6 +6583,7 @@ <types> <optype class="cmdline" format="--max_error_count=#" setvar="max_error_count"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6390,6 +6606,7 @@ <types> <optype class="cmdline" format="--max_heap_table_size=#" setvar="max_heap_table_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6401,6 +6618,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="max_insert_delayed_threads"> + <name>max_insert_delayed_threads</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="max_join_size"> <name>max_join_size</name> <shortdescription lang="en">Joins that are probably going to read more than @@ -6411,6 +6645,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--max_join_size=#" setvar="max_join_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6432,6 +6667,7 @@ <types> <optype class="cmdline" format="--max_length_for_sort_data=#" setvar="max_length_for_sort_data"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -6454,6 +6690,7 @@ <types> <optype class="cmdline" format="--max_prepared_stmt_count=#" setvar="max_prepared_stmt_count"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6468,9 +6705,7 @@ <mysqloption id="max_relay_log_size"> <name>max_relay_log_size</name> <shortdescription lang="en">If non-zero: relay log will be rotated - automatically when the size exceeds this value; if zero (the default): - when the size exceeds max_binlog_size. 0 excepted, the minimum value for - this variable is 4096</shortdescription> + automatically when the size exceeds this value</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -6478,10 +6713,11 @@ <types> <optype class="cmdline" format="--max_relay_log_size=#" setvar="max_relay_log_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> - <value default="0"/> + <value default="0" maximum="4096" minimum="0"/> </values> <versions> <manual version="4.1"/> @@ -6500,6 +6736,7 @@ <types> <optype class="cmdline" format="--max_seeks_for_key=#" setvar="max_seeks_for_key"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6522,6 +6759,7 @@ <types> <optype class="cmdline" format="--max_sort_length=#" setvar="max_sort_length"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6544,6 +6782,7 @@ <types> <optype class="cmdline" format="--max_sp_recursion_depth[=#]" setvar="max_sp_recursion_depth"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -6565,6 +6804,7 @@ <types> <optype class="cmdline" format="--max_tmp_tables=#" setvar="max_tmp_tables"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6587,6 +6827,7 @@ <types> <optype class="cmdline" format="--max_user_connections=#" setvar="max_user_connections"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6609,6 +6850,7 @@ <types> <optype class="cmdline" format="--max_write_lock_count=#" setvar="max_write_lock_count"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6629,6 +6871,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--memlock" setvar="memlock"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -6642,16 +6885,15 @@ </mysqloption> <mysqloption id="merge"> <name>merge</name> - <shortdescription lang="en">Enable Merge storage engine. Disable with - --skip-merge. --myisam-recover[=name] Syntax: - myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP, - FORCE or QUICK</shortdescription> + <shortdescription lang="en">Enable Merge storage engine</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <disabledby xref="skip-merge"/> <types> <optype class="cmdline" format="--merge" setvar="merge"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -6672,6 +6914,7 @@ <types> <optype class="cmdline" format="--multi_range_count=#" setvar="multi_range_count"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -6682,6 +6925,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="multi_read_range"> + <name>multi_read_range</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="both"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="myisam-recover"> <name>myisam-recover</name> <shortdescription lang="en">Syntax: myisam-recover[=option[,option...]], @@ -6693,6 +6953,7 @@ <types> <optype class="cmdline" format="--myisam-recover[=name]" setvar="myisam-recover"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="string" platform="all"> @@ -6718,6 +6979,7 @@ <types> <optype class="cmdline" format="--myisam_block_size=#" setvar="myisam_block_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -6740,6 +7002,7 @@ <types> <optype class="cmdline" format="--myisam_data_pointer_size=#" setvar="myisam_data_pointer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -6761,6 +7024,7 @@ <types> <optype class="cmdline" format="--myisam_max_extra_sort_file_size=#" setvar="myisam_max_extra_sort_file_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -6783,6 +7047,7 @@ <types> <optype class="cmdline" format="--myisam_max_sort_file_size=#" setvar="myisam_max_sort_file_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6805,6 +7070,7 @@ <types> <optype class="cmdline" format="--myisam_repair_threads=#" setvar="myisam_repair_threads"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6828,6 +7094,7 @@ <types> <optype class="cmdline" format="--myisam_sort_buffer_size=#" setvar="myisam_sort_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -6850,6 +7117,7 @@ <types> <optype class="cmdline" format="--myisam_stats_method=name" setvar="myisam_stats_method"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="enumeration" platform="all" inversion="4.1" @@ -6878,6 +7146,7 @@ <types> <optype class="cmdline" format="--myisam_use_mmap" setvar="myisam_use_mmap"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="boolean" platform="all"> @@ -7105,24 +7374,14 @@ </mysqloption> <mysqloption id="ndb-shm"> <name>ndb-shm</name> - <shortdescription lang="en">Use shared memory connections when available. - --ndb-optimized-node-selection Select nodes for transactions in a more - optimal way. --ndb-cache-check-time=# A dedicated thread is created to, at - the given millisecons interval, invalidate the query cache if another - MySQL server in the cluster has changed the data in the database. - --ndb-index-stat-enable Use ndb index statistics in query optimization. - --ndb-index-stat-cache-entries[=#] Number of start/end keys to store in - statistics memory cache. Zero means no cache and forces query of db nodes - always. --ndb-index-stat-update-freq[=#] How often, in the long run, to - query db nodes instead of statistics cache. For example 20 means every - 20th time. --ndb-use-copying-alter-table Force ndbcluster to always copy - tables at alter table (should only be used if on-line alter table fails)</shortdescription> + <shortdescription lang="en">Use shared memory connections when available</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--ndb-shm" setvar="ndb-shm"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -7162,27 +7421,33 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="ndb_extra_logging"> + <name>ndb_extra_logging</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="ndb_force_send"> <name>ndb_force_send</name> - <shortdescription lang="en">same as --ndb-force-send. - --ndb-extra-logging[=#] Turn on more logging in the error log. - --ndb-report-thresh-binlog-epoch-slip=# Threshold on number of epochs to - be behind before reporting binlog status. E.g. 3 means that if the - difference between what epoch has been received from the storage nodes and - what has been applied to the binlog is 3 or more, a status message will be - sent to the cluster log. --ndb-report-thresh-binlog-mem-usage=# Threshold - on percentage of free memory before reporting binlog status. E.g. 10 means - that if amount of available memory for receiving binlog data from the - storage nodes goes below 10%, a status message will be sent to the cluster - log. --ndb-use-exact-count Use exact records count during query planning - and for fast select count(*), disable for faster queries. - --ndb_use_exact_count same as --ndb-use-exact-count</shortdescription> + <shortdescription lang="en">same as --ndb-force-send.</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--ndb_force_send" setvar="ndb_force_send"/> + <optype class="cmdline" format="--ndb-force-send" setvar="ndb_force_send"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -7210,16 +7475,14 @@ <mysqloption id="ndbcluster"> <name>ndbcluster</name> <shortdescription lang="en">Enable NDB Cluster (if this version of MySQL - supports it). Disable with --skip-ndbcluster (will save memory). - --ndb-connectstring=name Connect string for ndbcluster. - --ndb-mgmd-host=name Set host and port for ndb_mgmd. Syntax: - hostname[:port]</shortdescription> + supports it)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--ndbcluster" setvar="ndbcluster"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -7242,6 +7505,7 @@ <types> <optype class="cmdline" format="--net_buffer_length=#" setvar="net_buffer_length"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7264,6 +7528,7 @@ <types> <optype class="cmdline" format="--net_read_timeout=#" setvar="net_read_timeout"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7286,6 +7551,7 @@ <types> <optype class="cmdline" format="--net_retry_count=#" setvar="net_retry_count"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7308,6 +7574,7 @@ <types> <optype class="cmdline" format="--net_write_timeout=#" setvar="net_write_timeout"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7365,6 +7632,7 @@ <types> <optype class="cmdline" format="--old-alter-table" setvar="old-alter-table"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -7377,15 +7645,14 @@ <mysqloption id="old-passwords"> <name>old-passwords</name> <shortdescription lang="en">Use old password encryption method (needed for - 4.0 and older clients). --old-style-user-limits Enable old-style user - limits (before 5.0.3 user resources were counted per each user+host vs. - per account)</shortdescription> + 4.0 and older clients)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--old-passwords" setvar="old-passwords"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -7408,6 +7675,7 @@ <types> <optype class="cmdline" format="--old-style-user-limits" setvar="old-style-user-limits"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -7418,12 +7686,27 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="old_passwords"> + <name>old_passwords</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="both"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="open_files_limit"> <name>open_files_limit</name> <shortdescription lang="en">If this is not 0, then mysqld will use this - value to reserve file descriptors to use with setrlimit(). If this value - is 0 then mysqld will reserve max_connections*5 or max_connections + - table_cache*2 (whichever is larger) number of files</shortdescription> + value to reserve file descriptors to use with setrlimit()</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -7431,6 +7714,7 @@ <types> <optype class="cmdline" format="--open_files_limit=#" setvar="open_files_limit"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -7454,6 +7738,7 @@ <types> <optype class="cmdline" format="--optimizer_prune_level[=#]" setvar="optimizer_prune_level"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7475,6 +7760,7 @@ <types> <optype class="cmdline" format="--optimizer_search_depth[=#]" setvar="optimizer_search_depth"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7494,6 +7780,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--pid-file=name" setvar="pid-file"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="filename" platform="all"> @@ -7514,6 +7801,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--plugin_dir=name" setvar="plugin_dir"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="filename" platform="all"> @@ -7556,6 +7844,7 @@ <types> <optype class="cmdline" format="--port-open-timeout=#" setvar="port-open-timeout"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -7577,6 +7866,7 @@ <types> <optype class="cmdline" format="--preload_buffer_size=#" setvar="preload_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7613,6 +7903,7 @@ <types> <optype class="cmdline" format="--query_alloc_block_size=#" setvar="query_alloc_block_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7634,6 +7925,7 @@ <types> <optype class="cmdline" format="--query_cache_limit=#" setvar="query_cache_limit"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -7656,6 +7948,7 @@ <types> <optype class="cmdline" format="--query_cache_min_res_unit=#" setvar="query_cache_min_res_unit"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -7678,6 +7971,7 @@ <types> <optype class="cmdline" format="--query_cache_size=#" setvar="query_cache_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -7699,6 +7993,7 @@ <types> <optype class="cmdline" format="--query_cache_type=#" setvar="query_cache_type"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="enumeration" platform="all"> @@ -7724,6 +8019,7 @@ <types> <optype class="cmdline" format="--query_cache_wlock_invalidate" setvar="query_cache_wlock_invalidate"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="boolean" platform="all"> @@ -7746,6 +8042,7 @@ <types> <optype class="cmdline" format="--query_prealloc_size=#" setvar="query_prealloc_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7768,6 +8065,7 @@ <types> <optype class="cmdline" format="--range_alloc_block_size=#" setvar="range_alloc_block_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7790,6 +8088,7 @@ <types> <optype class="cmdline" format="--read_buffer_size=#" setvar="read_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7810,6 +8109,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--read_only" setvar="read_only"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -7833,6 +8133,7 @@ <types> <optype class="cmdline" format="--read_rnd_buffer_size=#" setvar="read_rnd_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -7853,6 +8154,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--record_buffer=#" setvar="record_buffer"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -7873,6 +8175,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--relay-log=name" setvar="relay-log"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -7892,6 +8195,7 @@ <types> <optype class="cmdline" format="--relay-log-index=name" setvar="relay-log-index"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -7911,6 +8215,7 @@ <types> <optype class="cmdline" format="--relay-log-info-file=name" setvar="relay-log-info-file"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="filename" platform="all"> @@ -7932,6 +8237,7 @@ <types> <optype class="cmdline" format="--relay_log_purge" setvar="relay_log_purge"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -7953,6 +8259,7 @@ <types> <optype class="cmdline" format="--relay_log_space_limit=#" setvar="relay_log_space_limit"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -7967,18 +8274,14 @@ <mysqloption id="replicate-do-db"> <name>replicate-do-db</name> <shortdescription lang="en">Tells the slave thread to restrict replication - to the specified database. To specify more than one database, use the - directive multiple times, once for each database. Note that this will only - work if you do not use cross-database queries such as UPDATE - some_db.some_table SET foo='bar' while having selected a different or no - database. If you need cross database updates to work, make sure you have - 3.23.28 or later, and use replicate-wild-do-table=db_name.%</shortdescription> + to the specified database. </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--replicate-do-db=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -7989,9 +8292,7 @@ <mysqloption id="replicate-do-table"> <name>replicate-do-table</name> <shortdescription lang="en">Tells the slave thread to restrict replication - to the specified table. To specify more than one table, use the directive - multiple times, once for each table. This will work for cross-database - updates, in contrast to replicate-do-db</shortdescription> + to the specified table</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -8008,17 +8309,14 @@ <mysqloption id="replicate-ignore-db"> <name>replicate-ignore-db</name> <shortdescription lang="en">Tells the slave thread to not replicate to the - specified database. To specify more than one database to ignore, use the - directive multiple times, once for each database. This option will not - work if you use cross database updates. If you need cross database updates - to work, make sure you have 3.23.28 or later, and use - replicate-wild-ignore-table=db_name.%. </shortdescription> + specified database</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--replicate-ignore-db=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8029,15 +8327,14 @@ <mysqloption id="replicate-ignore-table"> <name>replicate-ignore-table</name> <shortdescription lang="en">Tells the slave thread to not replicate to the - specified table. To specify more than one table to ignore, use the - directive multiple times, once for each table. This will work for - cross-datbase updates, in contrast to replicate-ignore-db</shortdescription> + specified table.</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--replicate-ignore-table=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8048,13 +8345,14 @@ <mysqloption id="replicate-rewrite-db"> <name>replicate-rewrite-db</name> <shortdescription lang="en">Updates to a database with a different name than - the original. Example: replicate-rewrite-db=master_db_name->slave_db_name</shortdescription> + the original.</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--replicate-rewrite-db=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8065,8 +8363,7 @@ <mysqloption id="replicate-same-server-id"> <name>replicate-same-server-id</name> <shortdescription lang="en">In replication, if set to 1, do not skip events - having our server id. Default value is 0 (to break infinite loops in - circular replication). Can't be set to 1 if</shortdescription> + having our server id. </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -8074,6 +8371,7 @@ <types> <optype class="cmdline" format="--replicate-same-server-id" setvar="replicate-same-server-id"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8095,6 +8393,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--replicate-wild-do-table=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8105,17 +8404,14 @@ <mysqloption id="replicate-wild-ignore-table"> <name>replicate-wild-ignore-table</name> <shortdescription lang="en">Tells the slave thread to not replicate to the - tables that match the given wildcard pattern. To specify more than one - table to ignore, use the directive multiple times, once for each table. - This will work for cross-database updates. Example: - replicate-wild-ignore-table=foo%.bar% will not do updates to tables in - databases that start with foo and whose table names start with bar</shortdescription> + tables that match the given wildcard pattern</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--replicate-wild-ignore-table=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8126,19 +8422,14 @@ <mysqloption id="report-host"> <name>report-host</name> <shortdescription lang="en">Hostname or IP of the slave to be reported to to - the master during slave registration. Will appear in the output of SHOW - SLAVE HOSTS. Leave unset if you do not want the slave to register itself - with the master. Note that it is not sufficient for the master to simply - read the IP of the slave off the socket once the slave connects. Due to - NAT and other routing issues, that IP may not be valid for connecting to - the slave from the master or other hosts. --report-password=name - Undocumented</shortdescription> + the master during slave registration</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--report-host=name" setvar="report-host"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -8157,6 +8448,7 @@ <types> <optype class="cmdline" format="--report-password=name" setvar="report-password"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -8168,15 +8460,14 @@ <mysqloption id="report-port"> <name>report-port</name> <shortdescription lang="en">Port for connecting to slave reported to the - master during slave registration. Set it only if the slave is listening on - a non-default port or if you have a special tunnel from the master or - other clients to the slave. If not sure, leave this option unset</shortdescription> + master during slave registration</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--report-port=#" setvar="report-port"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -8197,6 +8488,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--report-user=name" setvar="report-user"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -8215,6 +8507,7 @@ <types> <optype class="cmdline" format="--rpl-recovery-rank=#" setvar="rpl-recovery-rank"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -8226,6 +8519,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="rpl_recovery_rank"> + <name>rpl_recovery_rank</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="safe-mode"> <name>safe-mode</name> <shortdescription lang="en">Skip some optimize stages (for testing). @@ -8236,6 +8546,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--safe-mode"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8251,8 +8562,10 @@ <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <deprecated version="5.0"/> <types> <optype class="cmdline" format="--safe-show-database"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8263,8 +8576,7 @@ <mysqloption id="safe-user-create"> <name>safe-user-create</name> <shortdescription lang="en">Don't allow new user creation by the user who - has no write privileges to the mysql.user table. --safemalloc-mem-limit=# - Simulate memory shortage when compiled with the</shortdescription> + has no write privileges to the mysql.user table</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -8272,6 +8584,7 @@ <types> <optype class="cmdline" format="--safe-user-create" setvar="safe-user-create"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8283,15 +8596,33 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="safe_show_database"> + <name>safe_show_database</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="boolean" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="safemalloc-mem-limit"> <name>safemalloc-mem-limit</name> - <shortdescription lang="en">Simulate memory shortage when compiled with the</shortdescription> + <shortdescription lang="en">Simulate memory shortage </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--safemalloc-mem-limit=#"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8309,6 +8640,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--secure-auth" setvar="secure-auth"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8320,6 +8652,23 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="secure_auth"> + <name>secure_auth</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="boolean" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="server-id"> <name>server-id</name> <shortdescription lang="en">Uniquely identifies the server instance in the @@ -8330,6 +8679,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--server-id=#" setvar="server-id"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="numeric" platform="all"> @@ -8341,15 +8691,32 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="server_id"> + <name>server_id</name> + <shortdescription lang=""/> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <vartype class="server" isdynamic="yes" type="global"/> + </types> + <values vartype="numeric" platform="all"/> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="set-variable"> <name>set-variable</name> <shortdescription lang="en">Change the value of a variable. Please note that - this option is deprecated;you can set variables directly with - --variable-name=value</shortdescription> + this option is deprecated;</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <deprecated version="5.0"/> <types> <optype class="cmdline" format="--set-variable=name"/> <optype class="cmdline" format="-O"/> @@ -8372,6 +8739,7 @@ <types> <optype class="cmdline" format="--show-slave-auth-info" setvar="show-slave-auth-info"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8383,6 +8751,50 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="skip-automatic-sp-privileges"> + <name>skip-automatic-sp-privileges</name> + <shortdescription lang="en">Skip Automatic Stored Procedure Privileges</shortdescription> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <types> + <optype class="cmdline" format="--skip-automatic-sp-privileges"/> + <optype class="mycnf"/> + </types> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> + <mysqloption id="skip-bdb"> + <name>skip-bdb</name> + <shortdescription lang="en">Disable Berkeley DB (if this version of MySQL + supports it).</shortdescription> + <section id="mysqld"/> + <opclass class="bdb"/> + <engines> + <engine engine="bdb"/> + </engines> + <platforms applies="all"/> + <disabledby xref="skip-bdb"/> + <types> + <optype class="cmdline" format="--skip-bdb" outversion="5.1.12" + setvar="have_bdb"/> + <optype class="mycnf"/> + <vartype class="server" format="have_bdb" outversion="5.1.12" + isdynamic="no"/> + </types> + <values vartype="boolean" platform="all"> + <value default="FALSE"/> + </values> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="skip-character-set-client-handshake"> <name>Skip Character set Client Handshake</name> <shortdescription lang="">Ignore client side character set value sent during @@ -8390,7 +8802,8 @@ <section id="mysqld"/> <opclass class="server"/> <types> - <optype class="cmdline" format="--skup-character-set-client-handshake"/> + <optype class="cmdline" format="--skip-character-set-client-handshake"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8398,6 +8811,25 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="skip-external-locking"> + <name>skip-external-locking</name> + <shortdescription lang="en">Skip system (external) locking</shortdescription> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <seealso xref="external-locking"/> + <types> + <optype class="cmdline" format="--skip-external-locking" + setvar="external-locking"/> + <optype class="mycnf"/> + </types> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="skip-grant-tables"> <name>skip-grant-tables</name> <shortdescription lang="en">Start without grant tables. This gives all users @@ -8409,6 +8841,7 @@ <types> <optype class="cmdline" format="--skip-grant-tables" setvar="skip-grant-tables"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8429,6 +8862,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-host-cache"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8447,6 +8881,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-innodb"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8454,36 +8889,60 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="skip-automatic-sp-privileges"> - <name>skip-automatic-sp-privileges</name> - <shortdescription lang="en">Skip Automatic Stored Procedure Privileges</shortdescription> + <mysqloption id="skip-innodb-checksums"> + <name>skip-innodb-checksums</name> + <shortdescription lang="en">Disable InnoDB checksums validation</shortdescription> <section id="mysqld"/> + <opclass class="innodb"/> + <engines> + <engine engine="innodb"/> + </engines> + <platforms applies="all"/> + <types> + <optype class="cmdline" format="--skip-innodb-checksums"/> + <optype class="mycnf"/> + </types> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> + <mysqloption id="skip-innodb-doublewrite"> + <name>skip-innodb-doublewrite</name> + <shortdescription lang="en">Disable InnoDB doublewrite buffer</shortdescription> + <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <seealso xref="innodb_doublewrite"/> <types> - <optype class="cmdline" format="--skip-automatic-sp-privileges"/> + <optype class="cmdline" format="--skip-innodb-doublewrite" + setvar="innodb_doublewrite"/> + <optype class="mycnf"/> </types> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="skip-innodb-checksums"> - <name>skip-innodb-checksums</name> - <shortdescription lang="en">Disable InnoDB checksums validation</shortdescription> + <mysqloption id="skip-large-pages"> + <name>skiplarge-pages</name> + <shortdescription lang="en">Disable support for large pages. </shortdescription> <section id="mysqld"/> - <opclass class="innodb"/> - <engines> - <engine engine="innodb"/> - </engines> + <opclass class="server"/> + <engines includes="all"/> <platforms applies="all"/> + <seealso xref="large-pages"/> <types> - <optype class="cmdline" format="--skip-innodb-checksums"/> + <optype class="cmdline" format="--skip-large-pages" setvar="large-pages"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> + <values vartype="boolean" platform="all"> + <value default="FALSE"/> + </values> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> @@ -8498,6 +8957,7 @@ <deprecated version="skip-external-locking"/> <types> <optype class="cmdline" format="--skip-locking"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8505,6 +8965,27 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="skip-merge"> + <name>skip-merge</name> + <shortdescription lang="en">Disable Merge storage engine</shortdescription> + <section id="mysqld"/> + <opclass class="server"/> + <engines includes="all"/> + <platforms applies="all"/> + <disabledby xref="skip-merge"/> + <types> + <optype class="cmdline" format="--skip-merge" setvar="merge"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> + </types> + <values vartype="boolean" platform="all"> + <value default="TRUE"/> + </values> + <versions> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="skip-name-resolve"> <name>skip-name-resolve</name> <shortdescription lang="en">Don't resolve hostnames. All hostnames are IP's @@ -8515,6 +8996,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-name-resolve"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8531,6 +9013,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-networking"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8540,14 +9023,14 @@ </mysqloption> <mysqloption id="skip-new"> <name>skip-new</name> - <shortdescription lang="en">Don't use new, possible wrong routines. - --skip-show-database Don't allow 'SHOW DATABASE' commands</shortdescription> + <shortdescription lang="en">Don't use new, possible wrong routines. </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-new"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8564,6 +9047,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-show-database"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8581,6 +9065,7 @@ <types> <optype class="cmdline" format="--skip-slave-start" setvar="skip-slave-start"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8601,6 +9086,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-stack-trace"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8610,11 +9096,7 @@ </mysqloption> <mysqloption id="skip-symbolic-links"> <name>skip-symbolic-links</name> - <shortdescription lang="en">instead. --skip-thread-priority Don't give - threads different priorities. --slave-load-tmpdir=name The location where - the slave should put its temporary files when replicating a LOAD DATA - INFILE command. --slave-skip-errors=name Tells the slave thread to - continue replication when a query returns an error from the provided list</shortdescription> + <shortdescription lang="en">Ignore symbolic links</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> @@ -8638,6 +9120,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-symlink"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8645,6 +9128,26 @@ <manual version="5.1"/> </versions> </mysqloption> + <mysqloption id="skip-sync-bdb-logs"> + <name>skip-sync-bdb-logs</name> + <shortdescription lang="en">Disables synchronous BDB log flushes</shortdescription> + <section id="mysqld"/> + <opclass class="bdb"/> + <engines> + <engine engine="bdb"/> + </engines> + <platforms applies="all"/> + <seealso xref="bdb-no-sync"/> + <types> + <optype class="cmdline" format="--skip-sync-bdb-logs" outversion="5.1.12"/> + <optype class="mycnf"/> + </types> + <versions> + <manual version="4.1"/> + <manual version="5.0"/> + <manual version="5.1"/> + </versions> + </mysqloption> <mysqloption id="skip-thread-priority"> <name>skip-thread-priority</name> <shortdescription lang="en">Don't give threads different priorities</shortdescription> @@ -8654,6 +9157,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--skip-thread-priority"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8672,6 +9176,7 @@ <types> <optype class="cmdline" format="--slave-load-tmpdir=name" setvar="slave-load-tmpdir"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="filename" platform="all"> @@ -8693,6 +9198,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--slave-skip-errors=name"/> + <optype class="mycnf"/> </types> <versions> <manual version="4.1"/> @@ -8710,6 +9216,7 @@ <types> <optype class="cmdline" format="--slave_compressed_protocol" setvar="slave_compressed_protocol"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="boolean" platform="all"> @@ -8732,6 +9239,7 @@ <types> <optype class="cmdline" format="--slave_net_timeout=#" setvar="slave_net_timeout"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -8755,6 +9263,7 @@ <types> <optype class="cmdline" format="--slave_transaction_retries=#" setvar="slave_transaction_retries"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -8775,6 +9284,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--slow-query-log" setvar="slow-query-log"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8795,6 +9305,7 @@ <types> <optype class="cmdline" format="--slow_launch_time=#" setvar="slow_launch_time"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"> @@ -8808,17 +9319,14 @@ </mysqloption> <mysqloption id="socket"> <name>socket</name> - <shortdescription lang="en">Socket file to use for connection. - --sporadic-binlog-dump-fail Option used by mysql-test for debugging and - testing of replication. --sql-bin-update-same=# The update log is - deprecated since version 5.0, is replaced by the binary log and this - option does nothing anymore</shortdescription> + <shortdescription lang="en">Socket file to use for connection. </shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> <optype class="cmdline" format="--socket=name" setvar="socket"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="filename" platform="linux"> @@ -8850,6 +9358,7 @@ <types> <optype class="cmdline" format="--sort_buffer_size=#" setvar="sort_buffer_size"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"> @@ -8872,6 +9381,7 @@ <types> <optype class="cmdline" format="--sporadic-binlog-dump-fail" setvar="sporadic-binlog-dump-fail"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8894,6 +9404,7 @@ <types> <optype class="cmdline" format="--sql-bin-update-same=#" setvar="sql-bin-update-same"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -8915,6 +9426,7 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--sql-mode=name" setvar="sql-mode"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="enumeration" platform="all"> @@ -8933,325 +9445,293 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ssl"> - <name>ssl</name> - <shortdescription lang="en">Enable SSL for connection (automatically enabled - with other flags). Disable with --skip-ssl</shortdescription> + <mysqloption id="sql_auto_is_null"> + <name>sql_auto_is_null</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--ssl" setvar="ssl"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> - <values vartype="boolean" platform="all"> - <value default="FALSE"/> - </values> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ssl-ca"> - <name>ssl-ca</name> - <shortdescription lang="en">CA file in PEM format (check OpenSSL docs, - implies --ssl)</shortdescription> + <mysqloption id="sql_big_selects"> + <name>sql_big_selects</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--ssl-ca=name" setvar="ssl-ca"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ssl-capath"> - <name>ssl-capath</name> - <shortdescription lang="en">CA directory (check OpenSSL docs, implies --ssl)</shortdescription> + <mysqloption id="sql_big_tables"> + <name>sql_big_tables</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--ssl-capath=name" setvar="ssl-capath"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ssl-cert"> - <name>ssl-cert</name> - <shortdescription lang="en">X509 cert in PEM format (implies --ssl)</shortdescription> + <mysqloption id="sql_buffer_result"> + <name>sql_buffer_result</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--ssl-cert=name" setvar="ssl-cert"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ssl-cipher"> - <name>ssl-cipher</name> - <shortdescription lang="en">SSL cipher to use (implies --ssl)</shortdescription> + <mysqloption id="sql_log_bin"> + <name>sql_log_bin</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--ssl-cipher=name" setvar="ssl-cipher"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ssl-key"> - <name>ssl-key</name> - <shortdescription lang="en">X509 key in PEM format (implies --ssl)</shortdescription> + <mysqloption id="sql_log_off"> + <name>sql_log_off</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--ssl-key=name" setvar="ssl-key"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="symbolic-links"> - <name>symbolic-links</name> - <shortdescription lang="en">instead</shortdescription> + <mysqloption id="sql_log_update"> + <name>sql_log_update</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--symbolic-links" setvar="symbolic-links"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> - <values vartype="boolean" platform="all"> - <value default="TRUE"/> - </values> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> - <manual version="4.1"/> <manual version="5.0"/> - <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sync-bdb-logs"> - <name>sync-bdb-logs</name> - <shortdescription lang="en">Synchronously flush Berkeley DB logs. Enabled by - default</shortdescription> + <mysqloption id="sql_low_priority_updates"> + <name>sql_low_priority_updates</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--sync-bdb-logs" setvar="sync-bdb-logs"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="both"/> </types> - <values vartype="boolean" platform="all"> - <value default="TRUE"/> - </values> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sync-binlog"> - <name>sync-binlog</name> - <shortdescription lang="en">Synchronously flush binary log to disk after - every #th event. Use 0 (default) to disable synchronous flushing</shortdescription> + <mysqloption id="sql_max_join_size"> + <name>sql_max_join_size</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--sync-binlog=#" setvar="sync-binlog"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="both"/> </types> - <values vartype="numeric" platform="all"> - <value default="0"/> - </values> + <values vartype="numeric" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sync-frm"> - <name>sync-frm</name> - <shortdescription lang="en">Sync .frm to disk on create. Enabled by default</shortdescription> + <mysqloption id="sql_mode"> + <name>sql_mode</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--sync-frm" setvar="sync-frm"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="both"/> </types> - <values vartype="boolean" platform="all"> - <value default="TRUE"/> - </values> + <values vartype="enumeration" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sysdate-is-now"> - <name>sysdate-is-now</name> - <shortdescription lang="en">Non-default option to alias SYSDATE() to NOW() - to make it safe-replicable</shortdescription> + <mysqloption id="sql_notes"> + <name>sql_notes</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--sysdate-is-now" setvar="sysdate-is-now"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> - <values vartype="boolean" platform="all"> - <value default="FALSE"/> - </values> + <values vartype="boolean" platform="all"/> <versions> + <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="table_cache"> - <name>table_cache</name> - <shortdescription lang="en">Deprecated; use --table_open_cache instead</shortdescription> + <mysqloption id="sql_quote_show_create"> + <name>sql_quote_show_create</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> - <deprecated version="5.1" xref="table_open_cache"/> <types> - <optype class="cmdline" format="--table_cache=#" setvar="table_cache"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> - <values vartype="numeric" platform="all"> - <value default="64"/> - </values> + <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="table_definition_cache"> - <name>table_definition_cache</name> - <shortdescription lang="en">Table Definition Cache</shortdescription> + <mysqloption id="sql_safe_updates"> + <name>sql_safe_updates</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype isdynamic="yes" class="server" type="global"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> - <values vartype="numeric" platform="all"/> + <values vartype="boolean" platform="all"/> <versions> + <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="table_lock_wait_timeout"> - <name>table_lock_wait_timeout</name> - <shortdescription lang="en">Timeout in seconds to wait for a table level - lock before returning an error. Used only if the connection has active - cursors</shortdescription> + <mysqloption id="sql_select_limit"> + <name>sql_select_limit</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--table_lock_wait_timeout=#" - setvar="table_lock_wait_timeout"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> - <values vartype="numeric" platform="all"> - <value default="50"/> - </values> + <values vartype="numeric" platform="all"/> <versions> + <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="table_open_cache"> - <name>table_open_cache</name> - <shortdescription lang="en">Table Open Cache</shortdescription> + <mysqloption id="sql_slave_skip_counter"> + <name>sql_slave_skip_counter</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype isdynamic="yes" class="server" type="global"/> + <vartype class="server" isdynamic="yes" type="global"/> </types> <values vartype="numeric" platform="all"/> <versions> + <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="tc-heuristic-recover"> - <name>tc-heuristic-recover</name> - <shortdescription lang="en">Decision to use in heuristic recover process. - Possible values are COMMIT or ROLLBACK</shortdescription> + <mysqloption id="sql_warnings"> + <name>sql_warnings</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--tc-heuristic-recover=name" - setvar="tc-heuristic-recover"/> - <vartype isdynamic="yes" class="server"/> + <vartype class="server" isdynamic="yes" type="session"/> </types> + <values vartype="boolean" platform="all"/> <versions> + <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="temp-pool"> - <name>temp-pool</name> - <shortdescription lang="en">Using this option will cause most temporary - files created to use a small set of names, rather than a unique name for - each new file</shortdescription> + <mysqloption id="ssl"> + <name>ssl</name> + <shortdescription lang="en">Enable SSL for connection (automatically enabled + with other flags)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--temp-pool" setvar="temp-pool"/> + <optype class="cmdline" format="--ssl" setvar="ssl"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> - <value default="TRUE"/> + <value default="FALSE"/> </values> <versions> <manual version="4.1"/> @@ -9259,80 +9739,53 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="thread_cache_size"> - <name>thread_cache_size</name> - <shortdescription lang="en">How many threads we should keep in a cache for - reuse</shortdescription> + <mysqloption id="ssl-ca"> + <name>ssl-ca</name> + <shortdescription lang="en">CA file in PEM format (check OpenSSL docs, + implies --ssl)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--thread_cache_size=#" - setvar="thread_cache_size"/> - <vartype isdynamic="yes" class="server" type="global"/> - </types> - <values vartype="numeric" platform="all"> - <value default="0"/> - </values> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="thread_concurrency"> - <name>thread_concurrency</name> - <shortdescription lang="en">Permits the application to give the threads - system a hint for the desired number of threads that should be run at the - same time</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--thread_concurrency=#" - setvar="thread_concurrency"/> + <optype class="cmdline" format="--ssl-ca=name" setvar="ssl-ca"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> - <values vartype="numeric" platform="all"> - <value default="10"/> - </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="thread_stack"> - <name>thread_stack</name> - <shortdescription lang="en">The stack size for each thread</shortdescription> + <mysqloption id="ssl-capath"> + <name>ssl-capath</name> + <shortdescription lang="en">CA directory (check OpenSSL docs, implies --ssl)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--thread_stack=#" setvar="thread_stack"/> + <optype class="cmdline" format="--ssl-capath=name" setvar="ssl-capath"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> - <values vartype="numeric" platform="all"> - <value default="196608"/> - </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="time_format"> - <name>time_format</name> - <shortdescription lang="en">The TIME format (for future)</shortdescription> + <mysqloption id="ssl-cert"> + <name>ssl-cert</name> + <shortdescription lang="en">X509 cert in PEM format (implies --ssl)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--time_format=name" setvar="time_format"/> + <optype class="cmdline" format="--ssl-cert=name" setvar="ssl-cert"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -9341,59 +9794,34 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="timed_mutexes"> - <name>timed_mutexes</name> - <shortdescription lang="en">Specify whether to time mutexes (only InnoDB - mutexes are currently supported)</shortdescription> + <mysqloption id="ssl-cipher"> + <name>ssl-cipher</name> + <shortdescription lang="en">SSL cipher to use (implies --ssl)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--timed_mutexes" setvar="timed_mutexes"/> + <optype class="cmdline" format="--ssl-cipher=name" setvar="ssl-cipher"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"> - <value default="FALSE"/> - </values> <versions> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="tmp_table_size"> - <name>tmp_table_size</name> - <shortdescription lang="en">If an in-memory temporary table exceeds this - size, MySQL will automatically convert it to an on-disk MyISAM table</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--tmp_table_size=#" - setvar="tmp_table_size"/> - <vartype isdynamic="yes" class="server" type="both"/> - </types> - <values vartype="numeric" platform="all"> - <value default="33554432"/> - </values> - <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="tmpdir"> - <name>tmpdir</name> - <shortdescription lang="en">Path for temporary files</shortdescription> + <mysqloption id="ssl-key"> + <name>ssl-key</name> + <shortdescription lang="en">X509 key in PEM format (implies --ssl)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--tmpdir=name" setvar="tmpdir"/> - <optype class="cmdline" format="-t" setvar="tmpdir"/> - <optype class="mycnf" format="tmpdir" setvar="tmpdir"/> + <optype class="cmdline" format="--ssl-key=name" setvar="ssl-key"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <versions> @@ -9402,133 +9830,57 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="transaction-isolation"> - <name>transaction-isolation</name> - <shortdescription lang="en">Default transaction isolation level</shortdescription> + <mysqloption id="storage_engine"> + <name>storage_engine</name> + <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--transaction-isolation=name"/> + <vartype class="server" isdynamic="yes" type="both"/> </types> + <values vartype="enumeration" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="transaction_alloc_block_size"> - <name>transaction_alloc_block_size</name> - <shortdescription lang="en">Allocation block size for transactions to be - stored in binary log</shortdescription> + <mysqloption id="symbolic-links"> + <name>symbolic-links</name> + <shortdescription lang="en">Use symbolic links</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--transaction_alloc_block_size=#" - setvar="transaction_alloc_block_size"/> - <vartype isdynamic="yes" class="server" type="both"/> + <optype class="cmdline" format="--symbolic-links" setvar="symbolic-links"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="numeric" platform="all"> - <value default="8192"/> + <values vartype="boolean" platform="all"> + <value default="TRUE"/> </values> <versions> <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="transaction_prealloc_size"> - <name>transaction_prealloc_size</name> - <shortdescription lang="en">Persistent buffer for transactions to be stored - in binary log</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--transaction_prealloc_size=#" - setvar="transaction_prealloc_size"/> - <vartype isdynamic="yes" class="server" type="both"/> - </types> - <values vartype="numeric" platform="all"> - <value default="4096"/> - </values> - <versions> <manual version="4.1"/> <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="updatable_views_with_limit"> - <name>updatable_views_with_limit</name> - <shortdescription lang="en">Updatable views with limit</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--updatable_views_with_limit=#" - setvar="updatable_views_with_limit"/> - <vartype isdynamic="yes" class="server" type="both"/> - </types> - <values vartype="enumeration" platform="all"> - <value default="1"/> - </values> - <values vartype="enumeration" platform="all"/> - <versions> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="use-symbolic-links"> - <name>use-symbolic-links</name> - <shortdescription lang="en">Enable symbolic link support. Deprecated option; - use</shortdescription> + <mysqloption id="sync-bdb-logs"> + <name>sync-bdb-logs</name> + <shortdescription lang="en">Synchronously flush Berkeley DB logs. Enabled by + default</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="-s"/> - <optype class="cmdline" format="--use-symbolic-links"/> - </types> - <versions> - <manual version="5.1"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="user"> - <name>user</name> - <shortdescription lang="en">Run mysqld daemon as user</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--user=name"/> - <optype class="cmdline" format="-u"/> - <optype class="mycnf" format="user"/> - </types> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="verbose"> - <name>verbose</name> - <shortdescription lang="en">Used with --help option for detailed help</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--verbose" setvar="verbose"/> - <optype class="cmdline" format="-v" setvar="verbose"/> - <optype class="mycnf" format="verbose" setvar="verbose"/> + <optype class="cmdline" format="--sync-bdb-logs" setvar="sync-bdb-logs"/> + <optype class="mycnf"/> <vartype isdynamic="yes" class="server"/> </types> <values vartype="boolean" platform="all"> @@ -9540,104 +9892,51 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="version"> - <name>version</name> - <shortdescription lang="en">Output version information and exit</shortdescription> + <mysqloption id="sync-binlog"> + <name>sync-binlog</name> + <shortdescription lang="en">Synchronously flush binary log to disk after + every #th event</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--version"/> - <optype class="cmdline" format="-V"/> - <optype class="mycnf" format="version"/> + <optype class="cmdline" format="--sync-binlog=#" setvar="sync-binlog"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> + <values vartype="numeric" platform="all"> + <value default="0"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="wait_timeout"> - <name>wait_timeout</name> - <shortdescription lang="en">The number of seconds the server waits for - activity on a connection before closing it</shortdescription> + <mysqloption id="sync-frm"> + <name>sync-frm</name> + <shortdescription lang="en">Sync .frm to disk on create. Enabled by default</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--wait_timeout=#" setvar="wait_timeout"/> - <vartype isdynamic="yes" class="server" type="both"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="warnings"> - <name>warnings</name> - <shortdescription lang="en">Deprecated; use --log-warnings instead</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--warnings[=#]"/> - <optype class="cmdline" format="-W"/> + <optype class="cmdline" format="--sync-frm" setvar="sync-frm"/> <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> + <values vartype="boolean" platform="all"> + <value default="TRUE"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="with-debug"> - <name>with-debug</name> - <shortdescription lang="en">option</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--with-debug=full"/> - </types> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="binlog_format"> - <name>Binlog format</name> - <shortdescription lang="en">Specifies the format of the binary log</shortdescription> - <section id="mysqld"/> - <opclass class="binlog"/> - <opclass class="replication"/> - <engines includes="all"/> - <platforms applies="all"/> - <seealso xref="log-bin-trust-function-creators"/> - <seealso xref="innodb_locks_unsafe_for_binlog"/> - <types> - <optype class="mycnf" format="binlog-format" setvar="binlog_format"/> - <vartype class="server" isdynamic="yes" type="both"/> - <optype class="cmdline" format="--binlog-format" setvar="binlog_format"/> - </types> - <values vartype="string" platform="all"> - <value default="row"/> - <choice value="row"/> - <choice value="statement"/> - <choice value="mixed"/> - </values> - <versions> - <introduced version="5.1.5"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="event_scheduler"> - <name>event_scheduler</name> + <mysqloption id="sync_binlog"> + <name>sync_binlog</name> <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> @@ -9646,40 +9945,6 @@ <types> <vartype class="server" isdynamic="yes" type="global"/> </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="foreign_key_checks"> - <name>foreign_key_checks</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="session"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="identity"> - <name>identity</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="session"/> - </types> <values vartype="numeric" platform="all"/> <versions> <manual version="4.1"/> @@ -9687,48 +9952,14 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="insert_id"> - <name>insert_id</name> + <mysqloption id="sync_frm"> + <name>sync_frm</name> <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="last_insert_id"> - <name>last_insert_id</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="session"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="local_infile"> - <name>local_infile</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> <vartype class="server" isdynamic="yes" type="global"/> </types> <values vartype="boolean" platform="all"/> @@ -9738,93 +9969,107 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="log_bin_trust_function_creators"> - <name>log_bin_trust_function_creators</name> - <shortdescription lang=""/> + <mysqloption id="sysdate-is-now"> + <name>sysdate-is-now</name> + <shortdescription lang="en">Non-default option to alias SYSDATE() to NOW() + to make it safe-replicable</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--sysdate-is-now" setvar="sysdate-is-now"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="boolean" platform="all"> + <value default="FALSE"/> + </values> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="log_queries_not_using_indexes"> - <name>log_queries_not_using_indexes</name> - <shortdescription lang=""/> + <mysqloption id="table_cache"> + <name>table_cache</name> + <shortdescription lang="en">Deprecated; use --table_open_cache instead</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <deprecated version="5.1" xref="table_open_cache"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--table_cache=#" setvar="table_cache"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="numeric" platform="all"> + <value default="64"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="log_warnings"> - <name>log_warnings</name> - <shortdescription lang=""/> + <mysqloption id="table_definition_cache"> + <name>table_definition_cache</name> + <shortdescription lang="en">Table Definition Cache</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <vartype isdynamic="yes" class="server" type="global"/> </types> <values vartype="numeric" platform="all"/> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="low_priority_updates"> - <name>low_priority_updates</name> - <shortdescription lang=""/> + <mysqloption id="table_lock_wait_timeout"> + <name>table_lock_wait_timeout</name> + <shortdescription lang="en">Timeout in seconds to wait for a table level + lock before returning an error. Used only if the connection has active + cursors</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--table_lock_wait_timeout=#" + setvar="table_lock_wait_timeout"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="numeric" platform="all"> + <value default="50"/> + </values> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="max_insert_delayed_threads"> - <name>max_insert_delayed_threads</name> - <shortdescription lang=""/> + <mysqloption id="table_open_cache"> + <name>table_open_cache</name> + <shortdescription lang="en">Table Open Cache</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <vartype isdynamic="yes" class="server" type="global"/> + <optype class="mycnf"/> </types> <values vartype="numeric" platform="all"/> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="multi_read_range"> - <name>multi_read_range</name> + <mysqloption id="table_type"> + <name>table_type</name> <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> @@ -9833,151 +10078,180 @@ <types> <vartype class="server" isdynamic="yes" type="both"/> </types> - <values vartype="numeric" platform="all"/> + <values vartype="enumeration" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ndb_extra_logging"> - <name>ndb_extra_logging</name> - <shortdescription lang=""/> + <mysqloption id="tc-heuristic-recover"> + <name>tc-heuristic-recover</name> + <shortdescription lang="en">Decision to use in heuristic recover process. + Possible values are COMMIT or ROLLBACK</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--tc-heuristic-recover=name" + setvar="tc-heuristic-recover"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="numeric" platform="all"/> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="old_passwords"> - <name>old_passwords</name> - <shortdescription lang=""/> + <mysqloption id="temp-pool"> + <name>temp-pool</name> + <shortdescription lang="en">Using this option will cause most temporary + files created to use a small set of names, rather than a unique name for + each new file</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--temp-pool" setvar="temp-pool"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="numeric" platform="all"/> + <values vartype="boolean" platform="all"> + <value default="TRUE"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="rpl_recovery_rank"> - <name>rpl_recovery_rank</name> - <shortdescription lang=""/> + <mysqloption id="thread_cache_size"> + <name>thread_cache_size</name> + <shortdescription lang="en">How many threads we should keep in a cache for + reuse</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--thread_cache_size=#" + setvar="thread_cache_size"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server" type="global"/> </types> - <values vartype="numeric" platform="all"/> + <values vartype="numeric" platform="all"> + <value default="0"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="safe_show_database"> - <name>safe_show_database</name> - <shortdescription lang=""/> + <mysqloption id="thread_concurrency"> + <name>thread_concurrency</name> + <shortdescription lang="en">Permits the application to give the threads + system a hint for the desired number of threads that should be run at the + same time</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--thread_concurrency=#" + setvar="thread_concurrency"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="numeric" platform="all"> + <value default="10"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="secure_auth"> - <name>secure_auth</name> - <shortdescription lang=""/> + <mysqloption id="thread_stack"> + <name>thread_stack</name> + <shortdescription lang="en">The stack size for each thread</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--thread_stack=#" setvar="thread_stack"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="numeric" platform="all"> + <value default="196608"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="server_id"> - <name>server_id</name> - <shortdescription lang=""/> + <mysqloption id="time_format"> + <name>time_format</name> + <shortdescription lang="en">The TIME format (for future)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--time_format=name" setvar="time_format"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="numeric" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_auto_is_null"> - <name>sql_auto_is_null</name> + <mysqloption id="time_zone"> + <name>time_zone</name> <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <vartype class="server" isdynamic="yes" type="both"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="string" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_big_selects"> - <name>sql_big_selects</name> - <shortdescription lang=""/> + <mysqloption id="timed_mutexes"> + <name>timed_mutexes</name> + <shortdescription lang="en">Specify whether to time mutexes (only InnoDB + mutexes are currently supported)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="--timed_mutexes" setvar="timed_mutexes"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="boolean" platform="all"> + <value default="FALSE"/> + </values> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_big_tables"> - <name>sql_big_tables</name> + <mysqloption id="timestamp"> + <name>timestamp</name> <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> @@ -9993,93 +10267,113 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_buffer_result"> - <name>sql_buffer_result</name> - <shortdescription lang=""/> + <mysqloption id="tmp_table_size"> + <name>tmp_table_size</name> + <shortdescription lang="en">If an in-memory temporary table exceeds this + size, MySQL will automatically convert it to an on-disk MyISAM table</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="--tmp_table_size=#" + setvar="tmp_table_size"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server" type="both"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="numeric" platform="all"> + <value default="33554432"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_log_bin"> - <name>sql_log_bin</name> - <shortdescription lang=""/> + <mysqloption id="tmpdir"> + <name>tmpdir</name> + <shortdescription lang="en">Path for temporary files</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="--tmpdir=name" setvar="tmpdir"/> + <optype class="cmdline" format="-t" setvar="tmpdir"/> + <optype class="mycnf" format="tmpdir" setvar="tmpdir"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_log_off"> - <name>sql_log_off</name> - <shortdescription lang=""/> + <mysqloption id="transaction-isolation"> + <name>transaction-isolation</name> + <shortdescription lang="en">Default transaction isolation level</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="--transaction-isolation=name"/> + <optype class="mycnf"/> </types> - <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_log_update"> - <name>sql_log_update</name> - <shortdescription lang=""/> + <mysqloption id="transaction_alloc_block_size"> + <name>transaction_alloc_block_size</name> + <shortdescription lang="en">Allocation block size for transactions to be + stored in binary log</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="--transaction_alloc_block_size=#" + setvar="transaction_alloc_block_size"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server" type="both"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="numeric" platform="all"> + <value default="8192"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_low_priority_updates"> - <name>sql_low_priority_updates</name> - <shortdescription lang=""/> + <mysqloption id="transaction_prealloc_size"> + <name>transaction_prealloc_size</name> + <shortdescription lang="en">Persistent buffer for transactions to be stored + in binary log</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--transaction_prealloc_size=#" + setvar="transaction_prealloc_size"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server" type="both"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="numeric" platform="all"> + <value default="4096"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_max_join_size"> - <name>sql_max_join_size</name> + <mysqloption id="tx_isolation"> + <name>tx_isolation</name> <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> @@ -10088,23 +10382,6 @@ <types> <vartype class="server" isdynamic="yes" type="both"/> </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="sql_mode"> - <name>sql_mode</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="both"/> - </types> <values vartype="enumeration" platform="all"/> <versions> <manual version="4.1"/> @@ -10112,8 +10389,8 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_notes"> - <name>sql_notes</name> + <mysqloption id="unique_checks"> + <name>unique_checks</name> <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> @@ -10129,242 +10406,190 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_quote_show_create"> - <name>sql_quote_show_create</name> - <shortdescription lang=""/> + <mysqloption id="updatable_views_with_limit"> + <name>updatable_views_with_limit</name> + <shortdescription lang="en">Updatable views with limit</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="--updatable_views_with_limit=#" + setvar="updatable_views_with_limit"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server" type="both"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="enumeration" platform="all"> + <value default="1"/> + </values> + <values vartype="enumeration" platform="all"/> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_safe_updates"> - <name>sql_safe_updates</name> - <shortdescription lang=""/> + <mysqloption id="use-symbolic-links"> + <name>use-symbolic-links</name> + <shortdescription lang="en">Enable symbolic link support.</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <deprecated version="5.0" xref="symbolic-links"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="-s"/> + <optype class="cmdline" format="--use-symbolic-links"/> + <optype class="mycnf"/> </types> - <values vartype="boolean" platform="all"/> <versions> - <manual version="4.1"/> - <manual version="5.0"/> <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="sql_select_limit"> - <name>sql_select_limit</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="session"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_slave_skip_counter"> - <name>sql_slave_skip_counter</name> - <shortdescription lang=""/> + <mysqloption id="user"> + <name>user</name> + <shortdescription lang="en">Run mysqld daemon as user</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--user=name"/> + <optype class="cmdline" format="-u"/> + <optype class="mycnf" format="user"/> </types> - <values vartype="numeric" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_warnings"> - <name>sql_warnings</name> - <shortdescription lang=""/> + <mysqloption id="verbose"> + <name>verbose</name> + <shortdescription lang="en">Used with --help option for detailed help</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="--verbose" setvar="verbose"/> + <optype class="cmdline" format="-v" setvar="verbose"/> + <optype class="mycnf" format="verbose" setvar="verbose"/> + <vartype isdynamic="yes" class="server"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="boolean" platform="all"> + <value default="TRUE"/> + </values> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="storage_engine"> - <name>storage_engine</name> - <shortdescription lang=""/> + <mysqloption id="version"> + <name>version</name> + <shortdescription lang="en">Output version information and exit</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--version"/> + <optype class="cmdline" format="-V"/> </types> - <values vartype="enumeration" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sync_binlog"> - <name>sync_binlog</name> - <shortdescription lang=""/> + <mysqloption id="wait_timeout"> + <name>wait_timeout</name> + <shortdescription lang="en">The number of seconds the server waits for + activity on a connection before closing it</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> + <optype class="cmdline" format="--wait_timeout=#" setvar="wait_timeout"/> + <optype class="mycnf"/> + <vartype isdynamic="yes" class="server" type="both"/> </types> <values vartype="numeric" platform="all"/> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sync_frm"> - <name>sync_frm</name> + <mysqloption id="warning_count"> + <name>warning_count</name> <shortdescription lang=""/> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="table_type"> - <name>table_type</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="both"/> - </types> - <values vartype="enumeration" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="time_zone"> - <name>time_zone</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="both"/> - </types> - <values vartype="string" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="timestamp"> - <name>timestamp</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> <vartype class="server" isdynamic="yes" type="session"/> </types> - <values vartype="boolean" platform="all"/> + <values vartype="numeric" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="tx_isolation"> - <name>tx_isolation</name> - <shortdescription lang=""/> + <mysqloption id="warnings"> + <name>warnings</name> + <shortdescription lang="en">Deprecated; use --log-warnings instead</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <deprecated version="5.0" xref="log-warnings"/> <types> - <vartype class="server" isdynamic="yes" type="both"/> + <optype class="cmdline" format="--warnings[=#]"/> + <optype class="cmdline" format="-W"/> + <optype class="mycnf"/> </types> - <values vartype="enumeration" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="unique_checks"> - <name>unique_checks</name> - <shortdescription lang=""/> + <mysqloption id="with-debug"> + <name>with-debug</name> + <shortdescription lang="en">option</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <optype class="cmdline" format="--with-debug=full"/> + <optype class="mycnf"/> </types> - <values vartype="boolean" platform="all"/> <versions> <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="warning_count"> - <name>warning_count</name> - <shortdescription lang=""/> + <mysqloption id="Aborted_clients"> + <name>Aborted_clients</name> + <shortdescription lang="en">The number of connections aborted because the + client died without closing the connection properly</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> <types> - <vartype class="server" isdynamic="yes" type="session"/> + <vartype isdynamic="no" class="status" type="both"/> </types> - <values vartype="numeric" platform="all"/> <versions> - <manual version="4.1"/> <manual version="5.0"/> <manual version="5.1"/> </versions> </mysqloption> + </mysqloptions>
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r3386 - trunk/mysqld-optvars | mcbrown | 18 Sep |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 1.598 sec. using MySQL 5.1.14-beta-log