Author: plavin
Date: 2007-12-07 18:07:52 +0100 (Fri, 07 Dec 2007)
New Revision: 9192
Log:
Update options file, update manual command option tables
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-6.0/dba-core.xml
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2007-12-07 16:55:10 UTC (rev 9191)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2007-12-07 17:07:52 UTC (rev 9192)
Changed blocks: 58, Lines Added: 64, Lines Deleted: 79; 20186 bytes
@@ -4930,7 +4930,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--abort-slave-event-count=#" setvar="abort-slave-event-count"/>
+ <optype class="cmdline" format="--abort-slave-event-count=#" />
<optype class="mycnf"/>
</types>
@@ -4962,7 +4962,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--allow-suspicious-udfs" setvar="allow-suspicious-udfs"/>
+ <optype class="cmdline" format="--allow-suspicious-udfs" />
<optype class="mycnf"/>
</types>
@@ -5025,8 +5025,8 @@
<types>
<optype class="cmdline" format="--auto-increment-increment[=#]"
setvar="auto_increment_increment"/>
- <optype class="mycnf" format="auto_increment_increment"/>
- <vartype class="system" isdynamic="no" scope="both"/>
+ <optype class="mycnf" format="auto-increment-increment"/>
+ <vartype class="system" isdynamic="no" scope="both" format="auto_increment_increment"/>
</types>
<values vartype="numeric" platform="all">
@@ -5059,9 +5059,9 @@
<seealso xref="auto-increment-increment"/>
<types>
- <optype class="cmdline" format="--auto_increment_offset[=#]" setvar="auto_increment_offset"/>
- <optype class="mycnf" format="auto_increment_offset"/>
- <vartype class="system" isdynamic="no" scope="both"/>
+ <optype class="cmdline" format="--auto-increment-offset[=#]" setvar="auto_increment_offset"/>
+ <optype class="mycnf" />
+ <vartype class="system" isdynamic="no" scope="both" format="auto_increment_offset"/>
</types>
<values vartype="numeric" platform="all">
@@ -5121,9 +5121,7 @@
<disabledby xref="skip-automatic_sp_privileges"/>
<types>
- <optype class="cmdline" format="--automatic-sp-privileges" setvar="automatic_sp_privileges"/>
- <optype class="mycnf"/>
- <vartype class="system" isdynamic="yes" scope="global"/>
+ <vartype class="system" isdynamic="yes" scope="global" format="automatic_sp_privileges"/>
</types>
<values vartype="boolean" platform="all">
@@ -5246,8 +5244,8 @@
<types>
<optype class="cmdline" format="--bdb-home=name" outversion="5.1.12" />
- <optype class="mycnf" setvar="bdb_home"/>
- <vartype class="system" scope="global" outversion="5.1.12" isdynamic="no"/>
+ <optype class="mycnf" />
+ <vartype class="system" scope="global" outversion="5.1.12" isdynamic="no" format="bdb_home"/>
</types>
<values vartype="filename" platform="all"/>
@@ -5302,9 +5300,9 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--bdb-logdir=file_name" outversion="5.1.12" setvar="bdb_logdir"/>
+ <optype class="cmdline" format="--bdb-logdir=file_name" outversion="5.1.12" />
<optype class="mycnf" format="bdb-logdir=file_name"/>
- <vartype class="system" scope="global" isdynamic="no" outversion="5.1.12"/>
+ <vartype class="system" scope="global" isdynamic="no" outversion="5.1.12" format="bdb_logdir"/>
</types>
<values vartype="filename" platform="all"/>
@@ -5376,8 +5374,8 @@
<types>
<optype class="cmdline" format="--bdb-shared-data" outversion="5.1.12"
setvar="bdb_shared_data"/>
- <optype class="mycnf" format="bdb_shared_data"/>
- <vartype class="system" scope="global" outversion="5.1.12"
+ <optype class="mycnf" format="bdb-shared-data"/>
+ <vartype class="system" scope="global" outversion="5.1.12" format="bdb_shared_data"
isdynamic="no"/>
</types>
@@ -5399,9 +5397,9 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--bdb-tmpdir=name" outversion="5.1.12" setvar="bdb_tmpdir"/>
- <optype class="mycnf" format="bdb_tmpdir" outversion="5.1.12"/>
- <vartype class="system" scope="global" outversion="5.1.12" isdynamic="no"/>
+ <optype class="cmdline" format="--bdb-tmpdir=name" outversion="5.1.12" />
+ <optype class="mycnf" format="bdb-tmpdir" outversion="5.1.12"/>
+ <vartype class="system" scope="global" outversion="5.1.12" isdynamic="no" format="bdb_tmpdir" />
</types>
<values vartype="filename" platform="all"/>
@@ -5524,7 +5522,7 @@
<optype class="cmdline" format="--big-tables" setvar="big_tables"/>
<optype class="mycnf"/>
<vartype class="system" scope="global" isdynamic="yes"/>
- <vartype class="system" scope="session" isdynamic="yes" inversion="5.1.18"/>
+ <vartype class="system" scope="session" isdynamic="yes" inversion="5.1.18" />
</types>
<values vartype="boolean" platform="all"/>
@@ -5549,7 +5547,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--bind-address=name" setvar="bind-address"/>
+ <optype class="cmdline" format="--bind-address=name"/>
<optype class="mycnf"/>
</types>
@@ -5699,7 +5697,7 @@
<types>
<optype class="mycnf" format="binlog-format" setvar="binlog_format"/>
<optype class="cmdline" format="--binlog-format" />
- <vartype class="system" isdynamic="no" scope="both" inversion="5.1.8"/>
+ <vartype class="system" isdynamic="no" scope="both" inversion="5.1.8" format="binlog_format"/>
</types>
<values vartype="enumeration" platform="all">
@@ -5790,8 +5788,7 @@
<seealso xref="skip-character-set-client-handshake"/>
<types>
- <optype class="cmdline" format="--character-set-client-handshake"
- setvar="character-set-client-handshake"/>
+ <optype class="cmdline" format="--character-set-client-handshake"/>
</types>
<values vartype="boolean" platform="all">
@@ -5824,7 +5821,7 @@
<optype class="cmdline" format="--character-set-filesystem=name"
setvar="character_set_filesystem"/>
<optype class="mycnf"/>
- <vartype class="system" scope="both" isdynamic="yes"/>
+ <vartype class="system" scope="both" isdynamic="yes" format="character_set_filesystem"/>
</types>
<values vartype="string" platform="all"/>
@@ -5850,7 +5847,7 @@
--default-collation=name
</shortdescription>
- <seealso xref="collation_server"/>
+ <seealso xref="collation-server"/>
<types>
<optype class="cmdline" format="--character-set-server" setvar="character_set_server"/>
@@ -6059,7 +6056,7 @@
<xrefto id="option_mysqld_collation-server"/>
- <name>collation_server</name>
+ <name>collation-server</name>
<shortdescription lang="en">
Set the default collation
@@ -6098,8 +6095,6 @@
<seealso xref="character-set-server"/>
<types>
- <optype class="cmdline" format="--collation_connection" setvar="collation_connection"/>
- <optype class="mycnf"/>
<vartype class="system" scope="both" format="collation_connection" isdynamic="yes"/>
</types>
@@ -6128,8 +6123,6 @@
<seealso xref="character-set-server"/>
<types>
- <optype class="cmdline" format="--collation_database" setvar="collation_database"/>
- <optype class="mycnf"/>
<vartype class="system" scope="both" format="collation_database" isdynamic="yes"/>
</types>
@@ -6340,7 +6333,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--crash_binlog_innodb=#" setvar="crash_binlog_innodb"/>
+ <optype class="cmdline" format="--crash_binlog_innodb=#" />
<optype class="mycnf"/>
</types>
@@ -6449,7 +6442,7 @@
<deprecated version="5.0"/>
<types>
- <optype class="cmdline" format="--default-character-set=name" setvar="default-character-set"/>
+ <optype class="cmdline" format="--default-character-set=name" />
<optype class="cmdline" format="-C" setvar="default-character-set"/>
<optype class="mycnf" format="default-character-set" setvar="default-character-set"/>
</types>
@@ -6502,12 +6495,12 @@
Set the default collation
</shortdescription>
- <seealso xref="collation_server"/>
+ <seealso xref="collation-server"/>
<deprecated version="4.1.3"/>
<types>
- <optype class="cmdline" format="--default-collation=name" setvar="default-collation"/>
+ <optype class="cmdline" format="--default-collation=name" />
<vartype isdynamic="no" class="system" />
</types>
@@ -7693,7 +7686,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--init-file=name" setvar="init-file"/>
+ <optype class="cmdline" format="--init-file=name" setvar="init_file"/>
<optype class="mycnf"/>
<vartype class="system" scope="global" isdynamic="no" format="init_file"/>
</types>
@@ -10521,7 +10514,7 @@
<platforms applies="linux"/>
<types>
- <optype class="cmdline" format="--large-pages" setvar="large-pages"/>
+ <optype class="cmdline" format="--large-pages" setvar="large_pages"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="large_pages"/>
</types>
@@ -10657,7 +10650,6 @@
<types>
<optype class="cmdline" format="--local-infile" setvar="local-infile"/>
<optype class="mycnf" format="local-infile"/>
- <vartype class="system" isdynamic="no" scope="global" format="local_infile"/>
</types>
<values vartype="boolean" platform="all">
@@ -10732,7 +10724,7 @@
</shortdescription>
<types>
- <vartype class="system" isdynamic="yes" scope="global" format="local_infile"/>
+ <vartype class="system" isdynamic="no" scope="global" format="local_infile"/>
</types>
<versions>
@@ -10777,9 +10769,11 @@
</mysqloption>
- <mysqloption section="server" id="_log">
+ <!--id already in use-->
+
+ <!--mysqloption section="server" id="log">
- <xrefto id="option_mysqld__log"/>
+ <xrefto id="option_mysqld_log"/>
<name>log</name>
@@ -10798,7 +10792,7 @@
<manual version="6.0"/>
</versions>
- </mysqloption>
+ </mysqloption-->
<mysqloption section="server" id="log-bin">
@@ -10812,9 +10806,8 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--log-bin" setvar="log-bin"/>
+ <optype class="cmdline" format="--log-bin" />
<optype class="mycnf"/>
- <vartype isdynamic="yes" scope="global" class="system"/>
</types>
<values vartype="filename" platform="all"/>
@@ -10863,9 +10856,8 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--log-bin-index=name" setvar="log-bin-index"/>
+ <optype class="cmdline" format="--log-bin-index=name" />
<optype class="mycnf"/>
- <vartype isdynamic="no" scope="global" class="system"/>
</types>
<values vartype="filename" platform="all"/>
@@ -10987,9 +10979,8 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--log-isam[=name]" setvar="log-isam"/>
+ <optype class="cmdline" format="--log-isam[=name]" />
<optype class="mycnf"/>
- <vartype isdynamic="no" scope="global" class="system"/>
</types>
<values vartype="filename" platform="all"></values>
@@ -11142,7 +11133,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--log-slave-updates" setvar="log-slave-updates"/>
+ <optype class="cmdline" format="--log-slave-updates" setvar="log_slave_updates"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="log_slave_updates"/>
</types>
@@ -11542,7 +11533,6 @@
<types>
<optype class="cmdline" format="--master-connect-retry=#"/>
<optype class="mycnf"/>
- <vartype class="system" isdynamic="no"/>
</types>
<values vartype="numeric" platform="all">
@@ -12698,8 +12688,7 @@
<types>
<optype class="cmdline" format="--merge"/>
<optype class="mycnf"/>
- <vartype isdynamic="no" scope="global" class="system"/>
- </types>
+ </types>
<values vartype="boolean" platform="all">
@@ -12976,9 +12965,8 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--myisam-recover[=name]" setvar="myisam-recover"/>
+ <optype class="cmdline" format="--myisam-recover[=name]" />
<optype class="mycnf"/>
- <vartype isdynamic="yes" scope="both" class="system"/>
</types>
<values vartype="enumeration" platform="all">
@@ -13246,7 +13234,6 @@
<types>
<optype class="cmdline" format="--ndb-cluster-connection-pool"/>
<optype class="mycnf"/>
- <vartype class="system" isdynamic="no"/>
</types>
<values vartype="numeric" platform="all">
@@ -13326,7 +13313,8 @@
</shortdescription>
<types>
- <vartype class="system" isdynamic="no" scope="global"/>
+ <optype class="cmdline" format="--ndb-connect-string" />
+ <optype class="mycnf"/>
</types>
<values vartype="string" platform="all"/>
@@ -13810,7 +13798,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--open-files-limit=#" setvar="open-files-limit"/>
+ <optype class="cmdline" format="--open-files-limit=#" setvar="open_files_limit"/>
<optype class="mycnf"/>
<vartype isdynamic="yes" scope="global" class="system" format="open_files_limit"/>
</types>
@@ -13904,7 +13892,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--pid-file=name" setvar="pid-file"/>
+ <optype class="cmdline" format="--pid-file=name" setvar="pid_file"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="pid_file"/>
</types>
@@ -14508,9 +14496,8 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--relay-log=name" setvar="relay-log"/>
+ <optype class="cmdline" format="--relay-log=name" />
<optype class="mycnf"/>
- <vartype isdynamic="yes" scope="both" class="system"/>
</types>
<values vartype="filename" platform="all"/>
@@ -15130,7 +15117,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--secure-auth" setvar="secure-auth"/>
+ <optype class="cmdline" format="--secure-auth" setvar="secure_auth"/>
<optype class="mycnf"/>
<vartype isdynamic="yes" scope="global" class="system" format="secure_auth"/>
</types>
@@ -15163,7 +15150,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--secure-file-priv" setvar="secure-file-priv"/>
+ <optype class="cmdline" format="--secure-file-priv" setvar="secure_file_priv"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="secure_file_priv"/>
</types>
@@ -15192,7 +15179,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--server-id=#" setvar="server-id"/>
+ <optype class="cmdline" format="--server-id=#" setvar="server_id"/>
<optype class="mycnf"/>
<vartype isdynamic="yes" scope="global" class="system" format="server_id"/>
</types>
@@ -15357,7 +15344,7 @@
MyISAM tables
</shortdescription>
- <seealso xref="concurrent-insert"/>
+ <seealso xref="concurrent_insert"/>
<types>
<optype class="cmdline" format="--skip-concurrent-insert" setvar="skip-concurrent_insert"/>
@@ -15640,7 +15627,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--skip-networking" setvar="skip-networking"/>
+ <optype class="cmdline" format="--skip-networking" setvar="skip_networking"/>
<optype class="mycnf"/>
<vartype class="system" scope="global" isdynamic="yes" format="skip_networking"/>
</types>
@@ -15669,7 +15656,6 @@
<types>
<optype class="cmdline" format="--skip-new"/>
<optype class="mycnf"/>
- <vartype class="system" scope="global" isdynamic="yes"/>
</types>
<versions>
@@ -15692,7 +15678,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--skip-show-database" setvar="skip-show-database"/>
+ <optype class="cmdline" format="--skip-show-database" setvar="skip_show_database"/>
<optype class="mycnf"/>
<vartype class="system" scope="global" isdynamic="yes" format="skip_show_database"/>
</types>
@@ -15899,7 +15885,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--slave-load-tmpdir=name" setvar="slave-load-tmpdir"/>
+ <optype class="cmdline" format="--slave-load-tmpdir=name" setvar="slave_load_tmpdir"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="slave_load_tmpdir"/>
</types>
@@ -15931,7 +15917,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--slave-skip-errors=name" setvar="slave-skip-errors"/>
+ <optype class="cmdline" format="--slave-skip-errors=name" setvar="slave_skip_errors"/>
<optype class="mycnf"/>
<vartype class="system" scope="global" isdynamic="yes" format="slave_skip_errors"/>
</types>
@@ -15991,7 +15977,7 @@
<seealso xref="net_read_timeout"/>
<types>
- <optype class="cmdline" format="--slave-net-timeout=#" setvar="slave-net-timeout"/>
+ <optype class="cmdline" format="--slave-net-timeout=#" setvar="slave_net_timeout"/>
<optype class="mycnf"/>
<vartype isdynamic="yes" class="system" scope="global" format="slave_net_timeout"/>
</types>
@@ -16310,7 +16296,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--sql-mode=name" setvar="sql-mode"/>
+ <optype class="cmdline" format="--sql-mode=name" setvar="sql_mode"/>
<optype class="mycnf"/>
<vartype isdynamic="yes" scope="both" class="system" format="sql_mode"/>
</types>
@@ -16842,7 +16828,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--ssl-ca=name" setvar="ssl-ca"/>
+ <optype class="cmdline" format="--ssl-ca=name" setvar="ssl_ca"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="ssl_ca"/>
</types>
@@ -16871,7 +16857,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--ssl-capath=name" setvar="ssl-capath"/>
+ <optype class="cmdline" format="--ssl-capath=name" setvar="ssl_capath"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="ssl_capath"/>
</types>
@@ -16900,7 +16886,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--ssl-cert=name" setvar="ssl-cert"/>
+ <optype class="cmdline" format="--ssl-cert=name" setvar="ssl_cert"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="ssl_cert"/>
</types>
@@ -16929,7 +16915,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--ssl-cipher=name" setvar="ssl-cipher"/>
+ <optype class="cmdline" format="--ssl-cipher=name" setvar="ssl_cipher"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="ssl_cipher"/>
</types>
@@ -16958,7 +16944,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--ssl-key=name" setvar="ssl-key"/>
+ <optype class="cmdline" format="--ssl-key=name" setvar="ssl_key"/>
<optype class="mycnf"/>
<vartype isdynamic="no" scope="global" class="system" format="ssl_key"/>
</types>
@@ -17073,7 +17059,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--sync-binlog=#" setvar="sync-binlog"/>
+ <optype class="cmdline" format="--sync-binlog=#" setvar="sync_binlog"/>
<optype class="mycnf"/>
<vartype isdynamic="yes" scope="global" class="system" format="sync_binlog"/>
</types>
@@ -17106,7 +17092,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--sync-frm" setvar="sync-frm"/>
+ <optype class="cmdline" format="--sync-frm" setvar="sync_frm"/>
<optype class="mycnf"/>
<vartype isdynamic="yes" scope="global" class="system" format="sync_frm"/>
</types>
@@ -18166,7 +18152,6 @@
<types>
<optype class="cmdline" format="--skip-log-warnings"/>
- <vartype isdynamic="no" scope="both" class="system"/>
</types>
<versions>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-12-07 16:55:10 UTC (rev 9191)
+++ trunk/refman-5.0/dba-core.xml 2007-12-07 17:07:52 UTC (rev 9192)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 845 bytes
@@ -3539,7 +3539,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_automatic-sp-privileges">
+ <para id="option_mysqld_automatic_sp_privileges">
<literal>automatic_sp_privileges</literal>
</para>
@@ -5345,7 +5345,7 @@
<literal>log_slave_updates</literal>
</para>
- <para condition="dynamic:optvar:item" role="5.0:mysqld:log-slave-updates"/>
+ <para condition="dynamic:optvar:item" role="5.0:mysqld:log_slave_updates"/>
<para>
Whether updates received by a slave server from a master
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2007-12-07 16:55:10 UTC (rev 9191)
+++ trunk/refman-5.1/dba-core.xml 2007-12-07 17:07:52 UTC (rev 9192)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 590 bytes
@@ -5568,7 +5568,7 @@
<literal>log_slave_updates</literal>
</para>
- <para condition="dynamic:optvar:item" role="5.1:mysqld:log-slave-updates"/>
+ <para condition="dynamic:optvar:item" role="5.1:mysqld:log_slave_updates"/>
<para>
Whether updates received by a slave server from a master
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2007-12-07 16:55:10 UTC (rev 9191)
+++ trunk/refman-6.0/dba-core.xml 2007-12-07 17:07:52 UTC (rev 9192)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 845 bytes
@@ -3664,7 +3664,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_automatic-sp-privileges">
+ <para id="option_mysqld_automatic_sp_privileges">
<literal>automatic_sp_privileges</literal>
</para>
@@ -5417,7 +5417,7 @@
<literal>log_slave_updates</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:log-slave-updates"/>
+ <para condition="dynamic:optvar:item" role="6.0:mysqld:log_slave_updates"/>
<para>
Whether updates received by a slave server from a master
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9192 - in trunk: dynamic-docs/command-optvars refman-5.0 refman-5.1 refman-6.0 | plavin | 7 Dec |
