Author: paul
Date: 2006-01-10 18:56:50 +0100 (Tue, 10 Jan 2006)
New Revision: 752
Log:
r6053@frost: paul | 2006-01-10 08:51:01 -0600
InnoDB: distinguish true options from system variables. Provide
more information on setting them.
Modified:
trunk/
trunk/refman-4.1/innodb.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.1/innodb.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6026
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1994
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6053
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1994
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-01-10 05:55:56 UTC (rev 751)
+++ trunk/refman-4.1/innodb.xml 2006-01-10 17:56:50 UTC (rev 752)
@@ -1010,31 +1010,72 @@
<title>&title-innodb-parameters;</title>
- <remark role="todo">
- Have separate lists for options and variables?
- </remark>
-
<para>
This section describes the <literal>InnoDB</literal>-related
- server options. In MySQL 4.0 and up, all of them can be specified
- in
- <option>--<replaceable>opt_name</replaceable>=<replaceable>value</replaceable></option>
- form on the command line or in option files. Before MySQL 4.0,
- numeric options should be specified using
- <option>--set-variable=<replaceable>opt_name</replaceable>=<replaceable>value</replaceable></option>
- or <option>-O
- <replaceable>opt_name</replaceable>=<replaceable>value</replaceable></option>
- syntax.
+ command options and system variables. System variables that are
+ true or false can be enabled at server startup by naming them, or
+ disabled by using a <literal>skip-</literal> prefix. For example,
+ to enable or disable <literal>InnoDB</literal> checksums, you can
+ use <option>--innodb_checksums</option> or
+ <option>--skip-innodb_checksums</option> on the command line, or
+ <literal>innodb_checksums</literal> or
+ <literal>skip-innodb_checksums</literal> in an option file. System
+ variables that take a numeric value can be specified as
+ <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+ on the command line or as
+ <literal><replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
+ in option files. (Before MySQL 4.0.2, variables that are true or
+ false are enabled by naming them or disabled by not naming them,
+ and numeric-value variables should be specified using
+ <option>--set-variable</option> syntax.) For more information on
+ specifying options and system variables, see
+ <xref linkend="program-options"/>.
</para>
- <remark role="todo">
- These should be listed using -opt_name=type_of_value syntax...
- </remark>
+ <para>
+ <literal>InnoDB</literal> command options:
+ </para>
<itemizedlist>
<listitem>
<para>
+ <option>--innodb</option>
+ </para>
+
+ <para>
+ Enables the <literal>InnoDB</literal> storage engine, if the
+ server was compiled with <literal>InnoDB</literal> support.
+ Use <option>--skip-innodb</option> to disable
+ <literal>InnoDB</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <option>--innodb_status_file</option>
+ </para>
+
+ <para>
+ Causes <literal>InnoDB</literal> to create a file named
+ <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
+ in the MySQL data directory. <literal>InnoDB</literal>
+ periodically writes the output of <literal>SHOW ENGINE INNODB
+ STATUS</literal> to this file. This option is available as of
+ MySQL 4.0.21.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ <literal>InnoDB</literal> system variables:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
<literal>innodb_additional_mem_pool_size</literal>
</para>
@@ -1584,19 +1625,6 @@
<listitem>
<para>
- <literal>innodb_status_file</literal>
- </para>
-
- <para>
- This option causes <literal>InnoDB</literal> to create a file
- <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
- for periodical <literal>SHOW INNODB STATUS</literal> output.
- This option is available as of MySQL 4.0.21.
- </para>
- </listitem>
-
- <listitem>
- <para>
<literal>innodb_table_locks</literal>
</para>
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-01-10 05:55:56 UTC (rev 751)
+++ trunk/refman-5.0/innodb.xml 2006-01-10 17:56:50 UTC (rev 752)
@@ -896,25 +896,67 @@
<title>&title-innodb-parameters;</title>
- <remark role="todo">
- Have separate lists for options and variables?
- </remark>
-
<para>
This section describes the <literal>InnoDB</literal>-related
- server options, all of which can be specified in
- <option>--<replaceable>opt_name</replaceable>=<replaceable>value</replaceable></option>
- form on the command line or in option files.
+ command options and system variables. System variables that are
+ true or false can be enabled at server startup by naming them, or
+ disabled by using a <literal>skip-</literal> prefix. For example,
+ to enable or disable <literal>InnoDB</literal> checksums, you can
+ use <option>--innodb_checksums</option> or
+ <option>--skip-innodb_checksums</option> on the command line, or
+ <literal>innodb_checksums</literal> or
+ <literal>skip-innodb_checksums</literal> in an option file. System
+ variables that take a numeric value can be specified as
+ <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+ on the command line or as
+ <literal><replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
+ in option files. For more information on specifying options and
+ system variables, see <xref linkend="program-options"/>.
</para>
- <remark role="todo">
- These should be listed using -opt_name=type_of_value syntax...
- </remark>
+ <para>
+ <literal>InnoDB</literal> command options:
+ </para>
<itemizedlist>
<listitem>
<para>
+ <option>--innodb</option>
+ </para>
+
+ <para>
+ Enables the <literal>InnoDB</literal> storage engine, if the
+ server was compiled with <literal>InnoDB</literal> support.
+ Use <option>--skip-innodb</option> to disable
+ <literal>InnoDB</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <option>--innodb_status_file</option>
+ </para>
+
+ <para>
+ Causes <literal>InnoDB</literal> to create a file named
+ <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
+ in the MySQL data directory. <literal>InnoDB</literal>
+ periodically writes the output of <literal>SHOW ENGINE INNODB
+ STATUS</literal> to this file.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ <literal>InnoDB</literal> system variables:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
<literal>innodb_additional_mem_pool_size</literal>
</para>
@@ -1578,19 +1620,6 @@
<listitem>
<para>
- <literal>innodb_status_file</literal>
- </para>
-
- <para>
- This option causes <literal>InnoDB</literal> to create a file
- <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
- for periodical <literal>SHOW ENGINE INNODB STATUS</literal>
- output.
- </para>
- </listitem>
-
- <listitem>
- <para>
<literal>innodb_support_xa</literal>
</para>
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-01-10 05:55:56 UTC (rev 751)
+++ trunk/refman-5.1/innodb.xml 2006-01-10 17:56:50 UTC (rev 752)
@@ -896,25 +896,67 @@
<title>&title-innodb-parameters;</title>
- <remark role="todo">
- Have separate lists for options and variables?
- </remark>
-
<para>
This section describes the <literal>InnoDB</literal>-related
- server options, all of which can be specified in
- <option>--<replaceable>opt_name</replaceable>=<replaceable>value</replaceable></option>
- form on the command line or in option files.
+ command options and system variables. System variables that are
+ true or false can be enabled at server startup by naming them, or
+ disabled by using a <literal>skip-</literal> prefix. For example,
+ to enable or disable <literal>InnoDB</literal> checksums, you can
+ use <option>--innodb_checksums</option> or
+ <option>--skip-innodb_checksums</option> on the command line, or
+ <literal>innodb_checksums</literal> or
+ <literal>skip-innodb_checksums</literal> in an option file. System
+ variables that take a numeric value can be specified as
+ <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+ on the command line or as
+ <literal><replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
+ in option files. For more information on specifying options and
+ system variables, see <xref linkend="program-options"/>.
</para>
- <remark role="todo">
- These should be listed using -opt_name=type_of_value syntax...
- </remark>
+ <para>
+ <literal>InnoDB</literal> command options:
+ </para>
<itemizedlist>
<listitem>
<para>
+ <option>--innodb</option>
+ </para>
+
+ <para>
+ Enables the <literal>InnoDB</literal> storage engine, if the
+ server was compiled with <literal>InnoDB</literal> support.
+ Use <option>--skip-innodb</option> to disable
+ <literal>InnoDB</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <option>--innodb_status_file</option>
+ </para>
+
+ <para>
+ Causes <literal>InnoDB</literal> to create a file named
+ <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
+ in the MySQL data directory. <literal>InnoDB</literal>
+ periodically writes the output of <literal>SHOW ENGINE INNODB
+ STATUS</literal> to this file.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ <literal>InnoDB</literal> system variables:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
<literal>innodb_additional_mem_pool_size</literal>
</para>
@@ -1557,19 +1599,6 @@
<listitem>
<para>
- <literal>innodb_status_file</literal>
- </para>
-
- <para>
- This option causes <literal>InnoDB</literal> to create a file
- <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
- for periodical <literal>SHOW ENGINE INNODB STATUS</literal>
- output.
- </para>
- </listitem>
-
- <listitem>
- <para>
<literal>innodb_support_xa</literal>
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r752 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 10 Jan |
