Author: paul
Date: 2008-03-14 18:36:47 +0100 (Fri, 14 Mar 2008)
New Revision: 10236
Log:
r29987@frost: paul | 2008-03-14 12:30:20 -0500
Style consistency: engine_name, not a mix of engine sometimes, engine_name
sometimes
Modified:
trunk/it/refman-5.1/sql-syntax.xml
trunk/pt/refman-5.1/sql-syntax.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-6.0/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29986
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29987
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml 2008-03-14 17:36:33 UTC (rev 10235)
+++ trunk/it/refman-5.1/sql-syntax.xml 2008-03-14 17:36:47 UTC (rev 10236)
Changed blocks: 12, Lines Added: 15, Lines Deleted: 15; 5031 bytes
@@ -228,7 +228,7 @@
ADD UNDOFILE '<replaceable>file</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -267,9 +267,9 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
the storage engine which is used by this log file group, with
- <replaceable>engine</replaceable> being the name of the storage
+ <replaceable>engine_name</replaceable> being the name of the storage
engine. In MySQL 5.1, the only accepted values for
- <replaceable>engine</replaceable> are <literal>NDB</literal> and
+ <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
</para>
@@ -1973,7 +1973,7 @@
{ADD|DROP} DATAFILE '<replaceable>file</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -2020,7 +2020,7 @@
<literal>ALTER TABLESPACE ... DROP DATAFILE</literal> require an
<literal>ENGINE</literal> clause which specifies the storage
engine used by the tablespace. In MySQL 5.1, the only accepted
- values for <replaceable>engine</replaceable> are
+ values for <replaceable>engine_name</replaceable> are
<literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
@@ -2697,8 +2697,8 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine to be used by this log file group, with
- <replaceable>engine</replaceable> being the name of the storage
- engine. In MySQL 5.1. <replaceable>engine</replaceable> must be
+ <replaceable>engine_name</replaceable> being the name of the storage
+ engine. In MySQL 5.1. <replaceable>engine_name</replaceable> must be
one of the values <literal>NDB</literal> or
<literal>NDBCLUSTER</literal>.
</para>
@@ -5223,7 +5223,7 @@
[NODEGROUP [=] <replaceable>nodegroup_id</replaceable>]
[WAIT]
[COMMENT [=] <replaceable>comment_text</replaceable>]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5323,8 +5323,8 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine which uses this tablespace, with
- <replaceable>engine</replaceable> being the name of the storage
- engine. In MySQL 5.1, <replaceable>engine</replaceable> must be
+ <replaceable>engine_name</replaceable> being the name of the storage
+ engine. In MySQL 5.1, <replaceable>engine_name</replaceable> must be
one of the values <literal>NDB</literal> or
<literal>NDBCLUSTER</literal>.
</para>
@@ -5601,7 +5601,7 @@
<programlisting>
DROP LOGFILE GROUP <replaceable>logfile_group</replaceable>
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5624,7 +5624,7 @@
The required <literal>ENGINE</literal> clause provides the name
of the storage engine used by the log file group to be dropped.
In MySQL 5.1, the only permitted values for
- <replaceable>engine</replaceable> are <literal>NDB</literal> and
+ <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
</para>
@@ -5821,7 +5821,7 @@
<programlisting>
DROP TABLESPACE <replaceable>tablespace</replaceable>
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5843,7 +5843,7 @@
<para>
The <literal>ENGINE</literal> clause (required) specifies the
storage engine used by the tablespace. In MySQL 5.1, the only
- accepted values for <replaceable>engine</replaceable> are
+ accepted values for <replaceable>engine_name</replaceable> are
<literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
@@ -21247,7 +21247,7 @@
You might also see <literal>DISABLED</literal> for a storage
engine if the server was compiled to support it, but was
started with a
- <option>--skip-<replaceable>engine</replaceable></option>
+ <option>--skip-<replaceable>engine_name</replaceable></option>
option. Only the <literal>InnoDB</literal>, and
<literal>MERGE</literal> engines can be disabled in this way.
For the <literal>NDB Cluster</literal> storage engine,
Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml 2008-03-14 17:36:33 UTC (rev 10235)
+++ trunk/pt/refman-5.1/sql-syntax.xml 2008-03-14 17:36:47 UTC (rev 10236)
Changed blocks: 12, Lines Added: 15, Lines Deleted: 15; 5031 bytes
@@ -228,7 +228,7 @@
ADD UNDOFILE '<replaceable>file</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -267,9 +267,9 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
the storage engine which is used by this log file group, with
- <replaceable>engine</replaceable> being the name of the storage
+ <replaceable>engine_name</replaceable> being the name of the storage
engine. In MySQL 5.1, the only accepted values for
- <replaceable>engine</replaceable> are <literal>NDB</literal> and
+ <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
</para>
@@ -1973,7 +1973,7 @@
{ADD|DROP} DATAFILE '<replaceable>file</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -2020,7 +2020,7 @@
<literal>ALTER TABLESPACE ... DROP DATAFILE</literal> require an
<literal>ENGINE</literal> clause which specifies the storage
engine used by the tablespace. In MySQL 5.1, the only accepted
- values for <replaceable>engine</replaceable> are
+ values for <replaceable>engine_name</replaceable> are
<literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
@@ -2697,8 +2697,8 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine to be used by this log file group, with
- <replaceable>engine</replaceable> being the name of the storage
- engine. In MySQL 5.1. <replaceable>engine</replaceable> must be
+ <replaceable>engine_name</replaceable> being the name of the storage
+ engine. In MySQL 5.1. <replaceable>engine_name</replaceable> must be
one of the values <literal>NDB</literal> or
<literal>NDBCLUSTER</literal>.
</para>
@@ -5223,7 +5223,7 @@
[NODEGROUP [=] <replaceable>nodegroup_id</replaceable>]
[WAIT]
[COMMENT [=] <replaceable>comment_text</replaceable>]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5323,8 +5323,8 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine which uses this tablespace, with
- <replaceable>engine</replaceable> being the name of the storage
- engine. In MySQL 5.1, <replaceable>engine</replaceable> must be
+ <replaceable>engine_name</replaceable> being the name of the storage
+ engine. In MySQL 5.1, <replaceable>engine_name</replaceable> must be
one of the values <literal>NDB</literal> or
<literal>NDBCLUSTER</literal>.
</para>
@@ -5601,7 +5601,7 @@
<programlisting>
DROP LOGFILE GROUP <replaceable>logfile_group</replaceable>
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5624,7 +5624,7 @@
The required <literal>ENGINE</literal> clause provides the name
of the storage engine used by the log file group to be dropped.
In MySQL 5.1, the only permitted values for
- <replaceable>engine</replaceable> are <literal>NDB</literal> and
+ <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
</para>
@@ -5821,7 +5821,7 @@
<programlisting>
DROP TABLESPACE <replaceable>tablespace</replaceable>
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5843,7 +5843,7 @@
<para>
The <literal>ENGINE</literal> clause (required) specifies the
storage engine used by the tablespace. In MySQL 5.1, the only
- accepted values for <replaceable>engine</replaceable> are
+ accepted values for <replaceable>engine_name</replaceable> are
<literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
@@ -21247,7 +21247,7 @@
You might also see <literal>DISABLED</literal> for a storage
engine if the server was compiled to support it, but was
started with a
- <option>--skip-<replaceable>engine</replaceable></option>
+ <option>--skip-<replaceable>engine_name</replaceable></option>
option. Only the <literal>InnoDB</literal>, and
<literal>MERGE</literal> engines can be disabled in this way.
For the <literal>NDB Cluster</literal> storage engine,
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-03-14 17:36:33 UTC (rev 10235)
+++ trunk/refman-4.1/dba-core.xml 2008-03-14 17:36:47 UTC (rev 10236)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 761 bytes
@@ -9154,7 +9154,7 @@
<para>
You might also see <literal>DISABLED</literal> for a storage
engine if the server was compiled to support it, but was started
- with a <option>--skip-<replaceable>engine</replaceable></option>
+ with a <option>--skip-<replaceable>engine_name</replaceable></option>
option. For example, <option>--skip-innodb</option> disables the
<literal>InnoDB</literal> engine. For the <literal>NDB
Cluster</literal> storage engine, <literal>DISABLED</literal>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2008-03-14 17:36:33 UTC (rev 10235)
+++ trunk/refman-5.0/sql-syntax.xml 2008-03-14 17:36:47 UTC (rev 10236)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 789 bytes
@@ -18346,7 +18346,7 @@
You might also see <literal>DISABLED</literal> for a storage
engine if the server was compiled to support it, but was
started with a
- <option>--skip-<replaceable>engine</replaceable></option>
+ <option>--skip-<replaceable>engine_name</replaceable></option>
option. For example, <option>--skip-innodb</option> disables
the <literal>InnoDB</literal> engine. For the <literal>NDB
Cluster</literal> storage engine, <literal>DISABLED</literal>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2008-03-14 17:36:33 UTC (rev 10235)
+++ trunk/refman-5.1/sql-syntax.xml 2008-03-14 17:36:47 UTC (rev 10236)
Changed blocks: 12, Lines Added: 15, Lines Deleted: 15; 5022 bytes
@@ -228,7 +228,7 @@
ADD UNDOFILE '<replaceable>file</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -267,9 +267,9 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
the storage engine which is used by this log file group, with
- <replaceable>engine</replaceable> being the name of the storage
+ <replaceable>engine_name</replaceable> being the name of the storage
engine. In MySQL 5.1, the only accepted values for
- <replaceable>engine</replaceable> are <literal>NDB</literal> and
+ <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
</para>
@@ -1973,7 +1973,7 @@
{ADD|DROP} DATAFILE '<replaceable>file</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -2020,7 +2020,7 @@
<literal>ALTER TABLESPACE ... DROP DATAFILE</literal> require an
<literal>ENGINE</literal> clause which specifies the storage
engine used by the tablespace. In MySQL 5.1, the only accepted
- values for <replaceable>engine</replaceable> are
+ values for <replaceable>engine_name</replaceable> are
<literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
@@ -2697,8 +2697,8 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine to be used by this log file group, with
- <replaceable>engine</replaceable> being the name of the storage
- engine. In MySQL 5.1. <replaceable>engine</replaceable> must be
+ <replaceable>engine_name</replaceable> being the name of the storage
+ engine. In MySQL 5.1. <replaceable>engine_name</replaceable> must be
one of the values <literal>NDB</literal> or
<literal>NDBCLUSTER</literal>.
</para>
@@ -5223,7 +5223,7 @@
[NODEGROUP [=] <replaceable>nodegroup_id</replaceable>]
[WAIT]
[COMMENT [=] <replaceable>comment_text</replaceable>]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5324,8 +5324,8 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine which uses this tablespace, with
- <replaceable>engine</replaceable> being the name of the storage
- engine. In MySQL 5.1, <replaceable>engine</replaceable> must be
+ <replaceable>engine_name</replaceable> being the name of the storage
+ engine. In MySQL 5.1, <replaceable>engine_name</replaceable> must be
one of the values <literal>NDB</literal> or
<literal>NDBCLUSTER</literal>.
</para>
@@ -5602,7 +5602,7 @@
<programlisting>
DROP LOGFILE GROUP <replaceable>logfile_group</replaceable>
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5625,7 +5625,7 @@
The required <literal>ENGINE</literal> clause provides the name
of the storage engine used by the log file group to be dropped.
In MySQL 5.1, the only permitted values for
- <replaceable>engine</replaceable> are <literal>NDB</literal> and
+ <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
</para>
@@ -5822,7 +5822,7 @@
<programlisting>
DROP TABLESPACE <replaceable>tablespace</replaceable>
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5844,7 +5844,7 @@
<para>
The <literal>ENGINE</literal> clause (required) specifies the
storage engine used by the tablespace. In MySQL 5.1, the only
- accepted values for <replaceable>engine</replaceable> are
+ accepted values for <replaceable>engine_name</replaceable> are
<literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
@@ -21248,7 +21248,7 @@
You might also see <literal>DISABLED</literal> for a storage
engine if the server was compiled to support it, but was
started with a
- <option>--skip-<replaceable>engine</replaceable></option>
+ <option>--skip-<replaceable>engine_name</replaceable></option>
option. Only the <literal>InnoDB</literal>, and
<literal>MERGE</literal> engines can be disabled in this way.
For the <literal>NDB Cluster</literal> storage engine,
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2008-03-14 17:36:33 UTC (rev 10235)
+++ trunk/refman-6.0/sql-syntax.xml 2008-03-14 17:36:47 UTC (rev 10236)
Changed blocks: 12, Lines Added: 15, Lines Deleted: 15; 5028 bytes
@@ -227,7 +227,7 @@
ADD UNDOFILE '<replaceable>file</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -260,9 +260,9 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
the storage engine which is used by this log file group, with
- <replaceable>engine</replaceable> being the name of the storage
+ <replaceable>engine_name</replaceable> being the name of the storage
engine. In MySQL 5.1, the only accepted values for
- <replaceable>engine</replaceable> are <literal>NDB</literal> and
+ <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
</para>
@@ -1925,7 +1925,7 @@
{ADD|DROP} DATAFILE '<replaceable>file</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -1966,7 +1966,7 @@
<literal>ALTER TABLESPACE ... DROP DATAFILE</literal> require an
<literal>ENGINE</literal> clause which specifies the storage
engine used by the tablespace. The only accepted values for
- <replaceable>engine</replaceable> are <literal>NDB</literal> and
+ <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
</para>
@@ -2629,8 +2629,8 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine to be used by this log file group, with
- <replaceable>engine</replaceable> being the name of the storage
- engine. The <replaceable>engine</replaceable> must be one of the
+ <replaceable>engine_name</replaceable> being the name of the storage
+ engine. The <replaceable>engine_name</replaceable> must be one of the
values <literal>NDB</literal> or <literal>NDBCLUSTER</literal>.
</para>
@@ -5127,7 +5127,7 @@
[NODEGROUP [=] <replaceable>nodegroup_id</replaceable>]
[WAIT]
[COMMENT [=] <replaceable>comment_text</replaceable>]
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5222,8 +5222,8 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine which uses this tablespace, with
- <replaceable>engine</replaceable> being the name of the storage
- engine. The <replaceable>engine</replaceable> clause must be one
+ <replaceable>engine_name</replaceable> being the name of the storage
+ engine. The <replaceable>engine_name</replaceable> clause must be one
of the values <literal>NDB</literal>,
<literal>NDBCLUSTER</literal>, or <literal>Falcon</literal>.
</para>
@@ -5490,7 +5490,7 @@
<programlisting>
DROP LOGFILE GROUP <replaceable>logfile_group</replaceable>
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5512,7 +5512,7 @@
<para>
The required <literal>ENGINE</literal> clause provides the name
of the storage engine used by the log file group to be dropped.
- The only permitted values for <replaceable>engine</replaceable>
+ The only permitted values for <replaceable>engine_name</replaceable>
are <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
@@ -5716,7 +5716,7 @@
<programlisting>
DROP TABLESPACE <replaceable>tablespace</replaceable>
- ENGINE [=] <replaceable>engine</replaceable>
+ ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
<para>
@@ -5738,7 +5738,7 @@
<para>
The <literal>ENGINE</literal> clause (required) specifies the
storage engine used by the tablespace. The only accepted values
- for <replaceable>engine</replaceable> are
+ for <replaceable>engine_name</replaceable> are
<literal>NDB</literal>, <literal>NDBCLUSTER</literal> and
<literal>Falcon</literal>.
</para>
@@ -21632,7 +21632,7 @@
You might also see <literal>DISABLED</literal> for a storage
engine if the server was compiled to support it, but was
started with a
- <option>--skip-<replaceable>engine</replaceable></option>
+ <option>--skip-<replaceable>engine_name</replaceable></option>
option. Only the <literal>InnoDB</literal>, and
<literal>MERGE</literal> engines can be disabled in this way.
For the <literal>NDB Cluster</literal> storage engine,
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10236 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 14 Mar |
