Author: paul
Date: 2008-03-14 20:59:38 +0100 (Fri, 14 Mar 2008)
New Revision: 10243
Log:
r30003@frost: paul | 2008-03-14 14:54:41 -0500
Minor wording revisions. Reformat.
Modified:
trunk/it/refman-5.1/restrictions.xml
trunk/it/refman-5.1/sql-syntax.xml
trunk/pt/refman-5.1/restrictions.xml
trunk/pt/refman-5.1/sql-syntax.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/restrictions.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/restrictions.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-6.0/restrictions.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:30001
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:30003
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/restrictions.xml
===================================================================
--- trunk/it/refman-5.1/restrictions.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/it/refman-5.1/restrictions.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 611 bytes
@@ -46,7 +46,7 @@
<para>
Some of the restrictions noted here apply to all stored routines;
that is, both to stored procedures and stored functions. Some of
- restrictions apply only to stored functions, and not to stored
+ these restrictions apply only to stored functions, and not to stored
procedures.
</para>
Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/it/refman-5.1/sql-syntax.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 14, Lines Added: 35, Lines Deleted: 41; 8044 bytes
@@ -233,11 +233,11 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file_name</replaceable>' to an existing log file group
- <replaceable>logfile_group</replaceable>. An <literal>ALTER
- LOGFILE GROUP</literal> statement has one and only one
- <literal>ADD UNDOFILE</literal> clause. No <literal>DROP
- UNDOFILE</literal> clause is supported.
+ '<replaceable>file_name</replaceable>' to an existing log file
+ group <replaceable>logfile_group</replaceable>. An
+ <literal>ALTER LOGFILE GROUP</literal> statement has one and
+ only one <literal>ADD UNDOFILE</literal> clause. No
+ <literal>DROP UNDOFILE</literal> clause is supported.
</para>
<para>
@@ -267,10 +267,10 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
the storage engine which is used by this log file group, with
- <replaceable>engine_name</replaceable> being the name of the storage
- engine. In MySQL 5.1, the only accepted values for
- <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
- <literal>NDBCLUSTER</literal>.
+ <replaceable>engine_name</replaceable> being the name of the
+ storage engine. In MySQL 5.1, the only accepted values for
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -1773,7 +1773,7 @@
<literal>REMOVE PARTITIONING</literal> was introduced in
MySQL 5.1.8 for the purpose of removing a table's
partitioning without otherwise affecting the table or its
- data. (Previously. this was done using the <literal>ENGINE
+ data. (Previously, this was done using the <literal>ENGINE
</literal> option.) This option can be combined with other
<literal>ALTER TABLE</literal> options such as those used to
add, drop, or rename drop columns or indexes.
@@ -2009,8 +2009,8 @@
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
TABLESPACE</literal> drops the data file
- '<replaceable>file_name</replaceable>' from the tablespace. This file
- must already have been added to the tablespace using
+ '<replaceable>file_name</replaceable>' from the tablespace. This
+ file must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
TABLESPACE</literal>; otherwise an error will result.
</para>
@@ -2503,9 +2503,9 @@
</para>
<para>
- Following the index column list, index options can be given. An
- <replaceable>index_option</replaceable> value can be any of the
- following:
+ As of MySQL 5.1.10, index options can be given following the
+ index column list. An <replaceable>index_option</replaceable>
+ value can be any of the following:
</para>
<itemizedlist>
@@ -2521,7 +2521,6 @@
size to use for index key blocks. The engine is allowed to
change the value if necessary. A value of 0 indicates that
the default value should be used.
- <literal>KEY_BLOCK_SIZE</literal> was added in MySQL 5.1.10.
</para>
</listitem>
@@ -2663,7 +2662,8 @@
<literal>UNDO</literal> file named
'<replaceable>undo_file</replaceable>'. A <literal>CREATE
LOGFILE GROUP</literal> statement has one and only one
- <literal>ADD UNDOFILE</literal> clause.
+ <literal>ADD UNDOFILE</literal> clause. For rules covering the
+ naming of log file groups, see <xref linkend="identifiers"/>.
</para>
<para>
@@ -2697,10 +2697,10 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine to be used by this log file group, with
- <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>.
+ <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>
<para>
@@ -4798,7 +4798,7 @@
<para>
One data directory and one index directory may be specified
per partition. If left unspecified, the data and indexes are
- stored by default in the MySQL data directory.
+ stored by default in the table's database directory.
</para>
<para>
@@ -5232,7 +5232,8 @@
data file is created and added to the tablespace using this
statement. Additional data files may be added to the tablespace
by using the <literal>ALTER TABLESPACE</literal> statement (see
- <xref linkend="alter-tablespace"/>).
+ <xref linkend="alter-tablespace"/>). For rules covering the
+ naming of tablespaces, see <xref linkend="identifiers"/>.
</para>
<para>
@@ -5323,10 +5324,10 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine which uses this tablespace, with
- <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>.
+ <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>
<para>
@@ -5624,8 +5625,8 @@
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_name</replaceable> are <literal>NDB</literal> and
- <literal>NDBCLUSTER</literal>.
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -7782,11 +7783,11 @@
used to interpret the information in the file. <literal>SET
NAMES</literal> and the setting of
<literal>character_set_client</literal> do not affect
- interpretation of input. Beginning with MySQL 5.1.17, if the
- contents of the input file use a character set that differs from
- the default, it is possible (and usually preferable) to use the
- <literal>CHARACTER SET</literal> clause to specify the character
- set of the file.
+ interpretation of input. If the contents of the input file use a
+ character set that differs from the default, it is usually
+ preferable to specify the character set of the file by using the
+ <literal>CHARACTER SET</literal> clause, which is available as
+ of MySQL 5.1.17.
</para>
<para>
@@ -11184,13 +11185,6 @@
</para>
<para>
- <literal>USE KEY</literal>, <literal>IGNORE KEY</literal>, and
- <literal>FORCE KEY</literal> are synonyms for <literal>USE
- INDEX</literal>, <literal>IGNORE INDEX</literal>, and
- <literal>FORCE INDEX</literal>.
- </para>
-
- <para>
Each hint requires the names of <emphasis>indexes</emphasis>,
not the names of columns. The name of a <literal>PRIMARY
KEY</literal> is <literal>PRIMARY</literal>. To see the index
Modified: trunk/pt/refman-5.1/restrictions.xml
===================================================================
--- trunk/pt/refman-5.1/restrictions.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/pt/refman-5.1/restrictions.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 611 bytes
@@ -46,7 +46,7 @@
<para>
Some of the restrictions noted here apply to all stored routines;
that is, both to stored procedures and stored functions. Some of
- restrictions apply only to stored functions, and not to stored
+ these restrictions apply only to stored functions, and not to stored
procedures.
</para>
Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/pt/refman-5.1/sql-syntax.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 14, Lines Added: 35, Lines Deleted: 41; 8044 bytes
@@ -233,11 +233,11 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file_name</replaceable>' to an existing log file group
- <replaceable>logfile_group</replaceable>. An <literal>ALTER
- LOGFILE GROUP</literal> statement has one and only one
- <literal>ADD UNDOFILE</literal> clause. No <literal>DROP
- UNDOFILE</literal> clause is supported.
+ '<replaceable>file_name</replaceable>' to an existing log file
+ group <replaceable>logfile_group</replaceable>. An
+ <literal>ALTER LOGFILE GROUP</literal> statement has one and
+ only one <literal>ADD UNDOFILE</literal> clause. No
+ <literal>DROP UNDOFILE</literal> clause is supported.
</para>
<para>
@@ -267,10 +267,10 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
the storage engine which is used by this log file group, with
- <replaceable>engine_name</replaceable> being the name of the storage
- engine. In MySQL 5.1, the only accepted values for
- <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
- <literal>NDBCLUSTER</literal>.
+ <replaceable>engine_name</replaceable> being the name of the
+ storage engine. In MySQL 5.1, the only accepted values for
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -1773,7 +1773,7 @@
<literal>REMOVE PARTITIONING</literal> was introduced in
MySQL 5.1.8 for the purpose of removing a table's
partitioning without otherwise affecting the table or its
- data. (Previously. this was done using the <literal>ENGINE
+ data. (Previously, this was done using the <literal>ENGINE
</literal> option.) This option can be combined with other
<literal>ALTER TABLE</literal> options such as those used to
add, drop, or rename drop columns or indexes.
@@ -2009,8 +2009,8 @@
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
TABLESPACE</literal> drops the data file
- '<replaceable>file_name</replaceable>' from the tablespace. This file
- must already have been added to the tablespace using
+ '<replaceable>file_name</replaceable>' from the tablespace. This
+ file must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
TABLESPACE</literal>; otherwise an error will result.
</para>
@@ -2503,9 +2503,9 @@
</para>
<para>
- Following the index column list, index options can be given. An
- <replaceable>index_option</replaceable> value can be any of the
- following:
+ As of MySQL 5.1.10, index options can be given following the
+ index column list. An <replaceable>index_option</replaceable>
+ value can be any of the following:
</para>
<itemizedlist>
@@ -2521,7 +2521,6 @@
size to use for index key blocks. The engine is allowed to
change the value if necessary. A value of 0 indicates that
the default value should be used.
- <literal>KEY_BLOCK_SIZE</literal> was added in MySQL 5.1.10.
</para>
</listitem>
@@ -2663,7 +2662,8 @@
<literal>UNDO</literal> file named
'<replaceable>undo_file</replaceable>'. A <literal>CREATE
LOGFILE GROUP</literal> statement has one and only one
- <literal>ADD UNDOFILE</literal> clause.
+ <literal>ADD UNDOFILE</literal> clause. For rules covering the
+ naming of log file groups, see <xref linkend="identifiers"/>.
</para>
<para>
@@ -2697,10 +2697,10 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine to be used by this log file group, with
- <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>.
+ <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>
<para>
@@ -4798,7 +4798,7 @@
<para>
One data directory and one index directory may be specified
per partition. If left unspecified, the data and indexes are
- stored by default in the MySQL data directory.
+ stored by default in the table's database directory.
</para>
<para>
@@ -5232,7 +5232,8 @@
data file is created and added to the tablespace using this
statement. Additional data files may be added to the tablespace
by using the <literal>ALTER TABLESPACE</literal> statement (see
- <xref linkend="alter-tablespace"/>).
+ <xref linkend="alter-tablespace"/>). For rules covering the
+ naming of tablespaces, see <xref linkend="identifiers"/>.
</para>
<para>
@@ -5323,10 +5324,10 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine which uses this tablespace, with
- <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>.
+ <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>
<para>
@@ -5624,8 +5625,8 @@
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_name</replaceable> are <literal>NDB</literal> and
- <literal>NDBCLUSTER</literal>.
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -7782,11 +7783,11 @@
used to interpret the information in the file. <literal>SET
NAMES</literal> and the setting of
<literal>character_set_client</literal> do not affect
- interpretation of input. Beginning with MySQL 5.1.17, if the
- contents of the input file use a character set that differs from
- the default, it is possible (and usually preferable) to use the
- <literal>CHARACTER SET</literal> clause to specify the character
- set of the file.
+ interpretation of input. If the contents of the input file use a
+ character set that differs from the default, it is usually
+ preferable to specify the character set of the file by using the
+ <literal>CHARACTER SET</literal> clause, which is available as
+ of MySQL 5.1.17.
</para>
<para>
@@ -11184,13 +11185,6 @@
</para>
<para>
- <literal>USE KEY</literal>, <literal>IGNORE KEY</literal>, and
- <literal>FORCE KEY</literal> are synonyms for <literal>USE
- INDEX</literal>, <literal>IGNORE INDEX</literal>, and
- <literal>FORCE INDEX</literal>.
- </para>
-
- <para>
Each hint requires the names of <emphasis>indexes</emphasis>,
not the names of columns. The name of a <literal>PRIMARY
KEY</literal> is <literal>PRIMARY</literal>. To see the index
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/refman-4.1/sql-syntax.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 7; 795 bytes
@@ -8106,13 +8106,6 @@
</para>
<para>
- <literal>USE KEY</literal>, <literal>IGNORE KEY</literal>, and
- <literal>FORCE KEY</literal> are synonyms for <literal>USE
- INDEX</literal>, <literal>IGNORE INDEX</literal>, and
- <literal>FORCE INDEX</literal>.
- </para>
-
- <para>
Each hint requires the names of <emphasis>indexes</emphasis>,
not the names of columns. The name of a <literal>PRIMARY
KEY</literal> is <literal>PRIMARY</literal>. To see the index
Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/refman-5.0/restrictions.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes
@@ -37,7 +37,7 @@
<para>
Some of the restrictions noted here apply to all stored routines;
that is, both to stored procedures and stored functions. Some of
- restrictions apply only to stored functions, and not to stored
+ these restrictions apply only to stored functions, and not to stored
procedures.
</para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/refman-5.0/sql-syntax.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 12; 1640 bytes
@@ -5463,11 +5463,11 @@
used to interpret the information in the file. <literal>SET
NAMES</literal> and the setting of
<literal>character_set_client</literal> do not affect
- interpretation of input. Beginning with MySQL 5.0.38, if the
- contents of the input file use a character set that differs from
- the default, it is possible (and usually preferable) to use the
- <literal>CHARACTER SET</literal> clause to specify the character
- set of the file.
+ interpretation of input. If the contents of the input file use a
+ character set that differs from the default, it is usually
+ preferable to specify the character set of the file by using the
+ <literal>CHARACTER SET</literal> clause, which is available as
+ of MySQL 5.1.17.
</para>
<para>
@@ -8882,13 +8882,6 @@
</para>
<para>
- <literal>USE KEY</literal>, <literal>IGNORE KEY</literal>, and
- <literal>FORCE KEY</literal> are synonyms for <literal>USE
- INDEX</literal>, <literal>IGNORE INDEX</literal>, and
- <literal>FORCE INDEX</literal>.
- </para>
-
- <para>
Each hint requires the names of <emphasis>indexes</emphasis>,
not the names of columns. The name of a <literal>PRIMARY
KEY</literal> is <literal>PRIMARY</literal>. To see the index
Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/refman-5.1/restrictions.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes
@@ -46,7 +46,7 @@
<para>
Some of the restrictions noted here apply to all stored routines;
that is, both to stored procedures and stored functions. Some of
- restrictions apply only to stored functions, and not to stored
+ these restrictions apply only to stored functions, and not to stored
procedures.
</para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/refman-5.1/sql-syntax.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 8, Lines Added: 26, Lines Deleted: 33; 5520 bytes
@@ -233,11 +233,11 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file_name</replaceable>' to an existing log file group
- <replaceable>logfile_group</replaceable>. An <literal>ALTER
- LOGFILE GROUP</literal> statement has one and only one
- <literal>ADD UNDOFILE</literal> clause. No <literal>DROP
- UNDOFILE</literal> clause is supported.
+ '<replaceable>file_name</replaceable>' to an existing log file
+ group <replaceable>logfile_group</replaceable>. An
+ <literal>ALTER LOGFILE GROUP</literal> statement has one and
+ only one <literal>ADD UNDOFILE</literal> clause. No
+ <literal>DROP UNDOFILE</literal> clause is supported.
</para>
<para>
@@ -267,10 +267,10 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
the storage engine which is used by this log file group, with
- <replaceable>engine_name</replaceable> being the name of the storage
- engine. In MySQL 5.1, the only accepted values for
- <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
- <literal>NDBCLUSTER</literal>.
+ <replaceable>engine_name</replaceable> being the name of the
+ storage engine. In MySQL 5.1, the only accepted values for
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -2009,8 +2009,8 @@
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
TABLESPACE</literal> drops the data file
- '<replaceable>file_name</replaceable>' from the tablespace. This file
- must already have been added to the tablespace using
+ '<replaceable>file_name</replaceable>' from the tablespace. This
+ file must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
TABLESPACE</literal>; otherwise an error will result.
</para>
@@ -2697,10 +2697,10 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine to be used by this log file group, with
- <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>.
+ <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>
<para>
@@ -5324,10 +5324,10 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine which uses this tablespace, with
- <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>.
+ <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>
<para>
@@ -5625,8 +5625,8 @@
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_name</replaceable> are <literal>NDB</literal> and
- <literal>NDBCLUSTER</literal>.
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -7783,11 +7783,11 @@
used to interpret the information in the file. <literal>SET
NAMES</literal> and the setting of
<literal>character_set_client</literal> do not affect
- interpretation of input. Beginning with MySQL 5.1.17, if the
- contents of the input file use a character set that differs from
- the default, it is possible (and usually preferable) to use the
- <literal>CHARACTER SET</literal> clause to specify the character
- set of the file.
+ interpretation of input. If the contents of the input file use a
+ character set that differs from the default, it is usually
+ preferable to specify the character set of the file by using the
+ <literal>CHARACTER SET</literal> clause, which is available as
+ of MySQL 5.1.17.
</para>
<para>
@@ -11185,13 +11185,6 @@
</para>
<para>
- <literal>USE KEY</literal>, <literal>IGNORE KEY</literal>, and
- <literal>FORCE KEY</literal> are synonyms for <literal>USE
- INDEX</literal>, <literal>IGNORE INDEX</literal>, and
- <literal>FORCE INDEX</literal>.
- </para>
-
- <para>
Each hint requires the names of <emphasis>indexes</emphasis>,
not the names of columns. The name of a <literal>PRIMARY
KEY</literal> is <literal>PRIMARY</literal>. To see the index
Modified: trunk/refman-6.0/restrictions.xml
===================================================================
--- trunk/refman-6.0/restrictions.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/refman-6.0/restrictions.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes
@@ -46,7 +46,7 @@
<para>
Some of the restrictions noted here apply to all stored routines;
that is, both to stored procedures and stored functions. Some of
- restrictions apply only to stored functions, and not to stored
+ these restrictions apply only to stored functions, and not to stored
procedures.
</para>
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2008-03-14 19:59:25 UTC (rev 10242)
+++ trunk/refman-6.0/sql-syntax.xml 2008-03-14 19:59:38 UTC (rev 10243)
Changed blocks: 10, Lines Added: 27, Lines Deleted: 32; 6007 bytes
@@ -232,11 +232,11 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file_name</replaceable>' to an existing log file group
- <replaceable>logfile_group</replaceable>. An <literal>ALTER
- LOGFILE GROUP</literal> statement has one and only one
- <literal>ADD UNDOFILE</literal> clause. No <literal>DROP
- UNDOFILE</literal> clause is supported.
+ '<replaceable>file_name</replaceable>' to an existing log file
+ group <replaceable>logfile_group</replaceable>. An
+ <literal>ALTER LOGFILE GROUP</literal> statement has one and
+ only one <literal>ADD UNDOFILE</literal> clause. No
+ <literal>DROP UNDOFILE</literal> clause is supported.
</para>
<para>
@@ -260,10 +260,10 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
the storage engine which is used by this log file group, with
- <replaceable>engine_name</replaceable> being the name of the storage
- engine. In MySQL 5.1, the only accepted values for
- <replaceable>engine_name</replaceable> are <literal>NDB</literal> and
- <literal>NDBCLUSTER</literal>.
+ <replaceable>engine_name</replaceable> being the name of the
+ storage engine. In MySQL 5.1, the only accepted values for
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -1929,7 +1929,7 @@
</programlisting>
<para>
- This statement can be used either to add a new data file to or
+ This statement can be used either to add a new data file to or
drop a data file from a tablespace.
</para>
@@ -1955,8 +1955,8 @@
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
TABLESPACE</literal> drops the data file
- '<replaceable>file_name</replaceable>' from the tablespace. This file
- must already have been added to the tablespace using
+ '<replaceable>file_name</replaceable>' from the tablespace. This
+ file must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
TABLESPACE</literal>; otherwise an error will result.
</para>
@@ -1966,8 +1966,8 @@
<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_name</replaceable> are <literal>NDB</literal> and
- <literal>NDBCLUSTER</literal>.
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -2629,9 +2629,10 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine to be used by this log file group, with
- <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>.
+ <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>
<para>
@@ -5222,9 +5223,9 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
engine which uses this tablespace, with
- <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>,
+ <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>
@@ -5512,8 +5513,9 @@
<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_name</replaceable>
- are <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
+ The only permitted values for
+ <replaceable>engine_name</replaceable> are
+ <literal>NDB</literal> and <literal>NDBCLUSTER</literal>.
</para>
<para>
@@ -7648,9 +7650,9 @@
NAMES</literal> and the setting of
<literal>character_set_client</literal> do not affect
interpretation of input. If the contents of the input file use a
- character set that differs from the default, it is possible (and
- usually preferable) to use the <literal>CHARACTER SET</literal>
- clause to specify the character set of the file.
+ character set that differs from the default, it is usually
+ preferable to specify the character set of the file by using the
+ <literal>CHARACTER SET</literal> clause.
</para>
<para>
@@ -11629,13 +11631,6 @@
</para>
<para>
- <literal>USE KEY</literal>, <literal>IGNORE KEY</literal>, and
- <literal>FORCE KEY</literal> are synonyms for <literal>USE
- INDEX</literal>, <literal>IGNORE INDEX</literal>, and
- <literal>FORCE INDEX</literal>.
- </para>
-
- <para>
Each hint requires the names of <emphasis>indexes</emphasis>,
not the names of columns. The name of a <literal>PRIMARY
KEY</literal> is <literal>PRIMARY</literal>. To see the index
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10243 - 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 |
