Author: paul
Date: 2006-01-06 21:26:32 +0100 (Fri, 06 Jan 2006)
New Revision: 709
Log:
r1993@kite-hub: paul | 2006-01-06 14:18:35 -0600
Non-temporal "while" -> although
Modified:
trunk/
trunk/refman-4.1/charset.xml
trunk/refman-4.1/connector-j.xml
trunk/refman-4.1/connector-net.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/ndbcluster.xml
trunk/refman-4.1/replication.xml
trunk/refman-4.1/tutorial.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.0/connector-j.xml
trunk/refman-5.0/connector-net.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/storage-engines.xml
trunk/refman-5.0/tutorial.xml
trunk/refman-5.1/charset.xml
trunk/refman-5.1/connector-j.xml
trunk/refman-5.1/connector-net.xml
trunk/refman-5.1/functions.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/introduction.xml
trunk/refman-5.1/ndbcluster.xml
trunk/refman-5.1/replication.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.1/storage-engines.xml
trunk/refman-5.1/tutorial.xml
trunk/refman-common/bug-reports.xml
trunk/refman-common/credits.xml
trunk/refman-common/news-4.0.xml
trunk/refman-common/news-5.1.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5912
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1992
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5912
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1993
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-4.1/charset.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -3385,7 +3385,7 @@
<literal>latin1</literal> is the default character set. The
<literal>latin1_swedish_ci</literal> collation is the
default that probably is used by the majority of MySQL
- customers. While it is frequently said that it is based on
+ customers. Although it is frequently said that it is based on
the Swedish/Finnish collation rules, there are Swedes and
Finns who disagree with this statement.
</para>
Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-4.1/connector-j.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -33,7 +33,7 @@
</para>
<para>
- While JDBC is useful by itself, we would hope that if you are not
+ Although JDBC is useful by itself, we would hope that if you are not
familiar with JDBC that after reading the first few sections of this
manual, that you would avoid using <quote>naked</quote> JDBC for all
but the most trivial problems and consider using one of the popular
@@ -527,7 +527,7 @@
</para>
<para>
- While <classname>CallableStatement</classname> supports
+ Although <classname>CallableStatement</classname> supports
calling any of the <classname>Statement</classname> execute
methods ( <function>executeUpdate()</function>,
<function>executeQuery()</function> or
@@ -960,7 +960,7 @@
</para>
<para>
- While Connector/J version 3.0 will connect to MySQL server,
+ Although Connector/J version 3.0 will connect to MySQL server,
version 4.1 or newer, and implements Unicode characters and
the new authorization mechanism, Connector/J 3.0 will not be
updated to support new features in current and future server
@@ -3673,7 +3673,7 @@
</para>
<para>
- While this is not usually an issue with the quick
+ Although this is not usually an issue with the quick
connection setup that MySQL offers compared to other
databases, creating new JDBC connections still incurs
networking and JDBC driver overhead that will be avoided
@@ -3863,7 +3863,7 @@
<para>
As with all other configuration rules-of-thumb, the answer is
- "It depends." While the optimal size depends on anticipated
+ "It depends." Although the optimal size depends on anticipated
load and average database transaction time, the optimum
connection pool size is smaller than you might expect. If you
take Sun's Java Petstore blueprint application for example, a
Modified: trunk/refman-4.1/connector-net.xml
===================================================================
--- trunk/refman-4.1/connector-net.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-4.1/connector-net.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -3883,7 +3883,7 @@
<title>Handling Invalid Dates</title>
<para>
- While it is strongly recommended that you avoid the use of
+ Although it is strongly recommended that you avoid the use of
invalid dates within your .NET application, it is possible to
use invalid dates by means of the
<literal>MySqlDateTime</literal> datatype.
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-4.1/installing.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -5319,7 +5319,7 @@
other than <literal>mysql</literal> when using the
configuration wizard. This will allow the new service to be
installed correctly, but leaves the outdated service in
- place. While this is harmless it is best to remove old
+ place. Although this is harmless, it is best to remove old
services that are no longer in use.
</para>
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-4.1/ndbcluster.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -500,7 +500,7 @@
</orderedlist>
<para>
- While we refer to a Linux operating system in this How-To, the
+ Although we refer to a Linux operating system in this How-To, the
instructions and procedures that we provide here should be easily
adaptable to either Solaris or Mac OS X. We also assume that you
already know how to perform a minimal installation and
@@ -1009,7 +1009,7 @@
<para>
Starting the cluster is not very difficult once it has been
configured. Each cluster node process must be started
- separately, and on the host where it resides. While it is
+ separately, and on the host where it resides. Although it is
possible to start the nodes in any order, it is recommended that
the management node be started first, followed by the storage
nodes, and then finally by any SQL nodes:
@@ -1902,7 +1902,7 @@
<para>
We are continuously making improvements in Cluster configuration
- and attempting to simplify this process. While we strive to
+ and attempting to simplify this process. Although we strive to
maintain backward compatibility, there may be times when
introduce an incompatible change. In such cases we will try to
let Cluster users know in advance if a change is not backward
@@ -3401,7 +3401,7 @@
<para>
This is an internal buffer used for passing messages
- within individual nodes and between nodes. While it is
+ within individual nodes and between nodes. Although it is
highly unlikely that this would need to be changed, it is
configurable. By default it is set to 1MB.
</para>
@@ -9448,7 +9448,7 @@
</para>
<para>
- No. While some specialized commands are used to manage and
+ No. Although some specialized commands are used to manage and
configure the cluster itself, only standard (My)SQL queries
and commands are required for:
</para>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-4.1/replication.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -179,7 +179,7 @@
Due to these limitations, we recommend that at this point you use
<literal>LOAD DATA FROM MASTER</literal> only if the dataset on
the master is relatively small, or if a prolonged read lock on the
- master is acceptable. While the actual speed of <literal>LOAD DATA
+ master is acceptable. Although the actual speed of <literal>LOAD DATA
FROM MASTER</literal> may vary from system to system, a good rule
of thumb for how long it takes is 1 second per 1MB of data. This
is a rough estimate, but you should find it fairly accurate if
@@ -945,7 +945,7 @@
</para>
<para>
- While this method is the most straightforward way to set up a
+ Although this method is the most straightforward way to set up a
slave, it is not the only one. For example, if you have a snapshot
of the master's data, and the master has its server ID set and
binary logging enabled, you can set up a slave without shutting
Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-4.1/tutorial.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -3445,7 +3445,7 @@
response to actions taken on rows in the table which you are
defining; in other words, this syntax induces no <literal>ON
DELETE</literal> or <literal>ON UPDATE</literal> behavior
- whatsoever. (While you can write an <literal>ON
+ whatsoever. (Although you can write an <literal>ON
DELETE</literal> or <literal>ON UPDATE</literal> clause as
part of the <literal>REFERENCES</literal> clause, it is also
ignored.)
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/charset.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -2714,7 +2714,7 @@
<literal>latin1</literal> is the default character set. The
<literal>latin1_swedish_ci</literal> collation is the
default that probably is used by the majority of MySQL
- customers. While it is frequently said that it is based on
+ customers. Although it is frequently said that it is based on
the Swedish/Finnish collation rules, there are Swedes and
Finns who disagree with this statement.
</para>
Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/connector-j.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -33,7 +33,7 @@
</para>
<para>
- While JDBC is useful by itself, we would hope that if you are not
+ Although JDBC is useful by itself, we would hope that if you are not
familiar with JDBC that after reading the first few sections of this
manual, that you would avoid using <quote>naked</quote> JDBC for all
but the most trivial problems and consider using one of the popular
@@ -527,7 +527,7 @@
</para>
<para>
- While <classname>CallableStatement</classname> supports
+ Although <classname>CallableStatement</classname> supports
calling any of the <classname>Statement</classname> execute
methods ( <function>executeUpdate()</function>,
<function>executeQuery()</function> or
@@ -960,7 +960,7 @@
</para>
<para>
- While Connector/J version 3.0 will connect to MySQL server,
+ Although Connector/J version 3.0 will connect to MySQL server,
version 4.1 or newer, and implements Unicode characters and
the new authorization mechanism, Connector/J 3.0 will not be
updated to support new features in current and future server
@@ -3673,7 +3673,7 @@
</para>
<para>
- While this is not usually an issue with the quick
+ Although this is not usually an issue with the quick
connection setup that MySQL offers compared to other
databases, creating new JDBC connections still incurs
networking and JDBC driver overhead that will be avoided
@@ -3863,7 +3863,7 @@
<para>
As with all other configuration rules-of-thumb, the answer is
- "It depends." While the optimal size depends on anticipated
+ "It depends." Although the optimal size depends on anticipated
load and average database transaction time, the optimum
connection pool size is smaller than you might expect. If you
take Sun's Java Petstore blueprint application for example, a
Modified: trunk/refman-5.0/connector-net.xml
===================================================================
--- trunk/refman-5.0/connector-net.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/connector-net.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -3883,7 +3883,7 @@
<title>Handling Invalid Dates</title>
<para>
- While it is strongly recommended that you avoid the use of
+ Although it is strongly recommended that you avoid the use of
invalid dates within your .NET application, it is possible to
use invalid dates by means of the
<literal>MySqlDateTime</literal> datatype.
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/functions.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -10647,7 +10647,7 @@
<listitem>
<para>
- While the use of multiple character sets within a single
+ Although the use of multiple character sets within a single
table is supported, all columns in a
<literal>FULLTEXT</literal> index must use the same
character set and collation.
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/installing.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -4106,7 +4106,7 @@
<filename>my.ini</filename> file located in the server
installation directory. To configure the client and utility
applications, create a new <filename>my.ini</filename> file in
- the <filename>C:\Windows</filename> or
+ the <filename>C:\WINDOWS</filename> or
<filename>C:\WINNT</filename> directory as is applicable to
your Windows version.
</para>
@@ -5262,7 +5262,7 @@
other than <literal>mysql</literal> when using the
configuration wizard. This will allow the new service to be
installed correctly, but leaves the outdated service in
- place. While this is harmless it is best to remove old
+ place. Although this is harmless, it is best to remove old
services that are no longer in use.
</para>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/introduction.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -523,7 +523,7 @@
be joined. The greedy optimizer reduces this to
<literal><replaceable>N</replaceable>!/(<replaceable>D</replaceable>-1)!</literal>,
where <replaceable>D</replaceable> is the depth of the
- search. While the greedy optimizer does not guarantee
+ search. Although the greedy optimizer does not guarantee
the best possible of all execution plans (this is
currently being worked on), it can reduce the time spent
arriving at an execution plan for a join involving a
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/ndbcluster.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -506,7 +506,7 @@
</orderedlist>
<para>
- While we refer to a Linux operating system in this How-To, the
+ Although we refer to a Linux operating system in this How-To, the
instructions and procedures that we provide here should be easily
adaptable to either Solaris or Mac OS X. We also assume that you
already know how to perform a minimal installation and
@@ -1015,7 +1015,7 @@
<para>
Starting the cluster is not very difficult once it has been
configured. Each cluster node process must be started
- separately, and on the host where it resides. While it is
+ separately, and on the host where it resides. Although it is
possible to start the nodes in any order, it is recommended that
the management node be started first, followed by the storage
nodes, and then finally by any SQL nodes:
@@ -1910,7 +1910,7 @@
<para>
We are continuously making improvements in Cluster configuration
- and attempting to simplify this process. While we strive to
+ and attempting to simplify this process. Although we strive to
maintain backward compatibility, there may be times when
introduce an incompatible change. In such cases we will try to
let Cluster users know in advance if a change is not backward
@@ -3411,7 +3411,7 @@
<para>
This is an internal buffer used for passing messages
- within individual nodes and between nodes. While it is
+ within individual nodes and between nodes. Although it is
highly unlikely that this would need to be changed, it is
configurable. By default it is set to 1MB.
</para>
@@ -8009,7 +8009,7 @@
<para>
<literal>NDB</literal> does not support repeatable reads,
- which can cause problems with the restoration process. While
+ which can cause problems with the restoration process. Although
the backup process is <quote>hot</quote>, restoring a MySQL
Cluster from backup is not a 100% <quote>hot</quote> process.
This is due to the fact that, for the duration of the restore
@@ -9726,7 +9726,7 @@
</para>
<para>
- No. While some specialized commands are used to manage and
+ No. Although some specialized commands are used to manage and
configure the cluster itself, only standard (My)SQL queries
and commands are required for:
</para>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/replication.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -180,7 +180,7 @@
Due to these limitations, we recommend that at this point you use
<literal>LOAD DATA FROM MASTER</literal> only if the dataset on
the master is relatively small, or if a prolonged read lock on the
- master is acceptable. While the actual speed of <literal>LOAD DATA
+ master is acceptable. Although the actual speed of <literal>LOAD DATA
FROM MASTER</literal> may vary from system to system, a good rule
of thumb for how long it takes is 1 second per 1MB of data. This
is a rough estimate, but you should find it fairly accurate if
@@ -884,7 +884,7 @@
</para>
<para>
- While this method is the most straightforward way to set up a
+ Although this method is the most straightforward way to set up a
slave, it is not the only one. For example, if you have a snapshot
of the master's data, and the master has its server ID set and
binary logging enabled, you can set up a slave without shutting
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -9015,7 +9015,7 @@
In previous versions of MySQL (prior to MySQL 4.1), only
nested queries of the form <literal>INSERT ... SELECT
...</literal> and <literal>REPLACE ... SELECT ...</literal>
- were supported. While this is not the case in MySQL
+ were supported. Although this is not the case in MySQL
¤t-series;, it is still true that there are sometimes
other ways to test membership in a set of values. It is also
true that on some occasions, it is not only possible to
Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/storage-engines.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -270,7 +270,7 @@
</programlisting>
<para>
- While <literal>TYPE</literal> is still supported in MySQL
+ Although <literal>TYPE</literal> is still supported in MySQL
¤t-series;, <literal>ENGINE</literal> is now the preferred
term.
</para>
Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.0/tutorial.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -3307,7 +3307,7 @@
response to actions taken on rows in the table which you are
defining; in other words, this syntax induces no <literal>ON
DELETE</literal> or <literal>ON UPDATE</literal> behavior
- whatsoever. (While you can write an <literal>ON
+ whatsoever. (Although you can write an <literal>ON
DELETE</literal> or <literal>ON UPDATE</literal> clause as
part of the <literal>REFERENCES</literal> clause, it is also
ignored.)
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/charset.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -2711,7 +2711,7 @@
<literal>latin1</literal> is the default character set. The
<literal>latin1_swedish_ci</literal> collation is the
default that probably is used by the majority of MySQL
- customers. While it is frequently said that it is based on
+ customers. Although it is frequently said that it is based on
the Swedish/Finnish collation rules, there are Swedes and
Finns who disagree with this statement.
</para>
Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/connector-j.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -33,7 +33,7 @@
</para>
<para>
- While JDBC is useful by itself, we would hope that if you are not
+ Although JDBC is useful by itself, we would hope that if you are not
familiar with JDBC that after reading the first few sections of this
manual, that you would avoid using <quote>naked</quote> JDBC for all
but the most trivial problems and consider using one of the popular
@@ -527,7 +527,7 @@
</para>
<para>
- While <classname>CallableStatement</classname> supports
+ Although <classname>CallableStatement</classname> supports
calling any of the <classname>Statement</classname> execute
methods ( <function>executeUpdate()</function>,
<function>executeQuery()</function> or
@@ -960,7 +960,7 @@
</para>
<para>
- While Connector/J version 3.0 will connect to MySQL server,
+ Although Connector/J version 3.0 will connect to MySQL server,
version 4.1 or newer, and implements Unicode characters and
the new authorization mechanism, Connector/J 3.0 will not be
updated to support new features in current and future server
@@ -3673,7 +3673,7 @@
</para>
<para>
- While this is not usually an issue with the quick
+ Although this is not usually an issue with the quick
connection setup that MySQL offers compared to other
databases, creating new JDBC connections still incurs
networking and JDBC driver overhead that will be avoided
@@ -3863,7 +3863,7 @@
<para>
As with all other configuration rules-of-thumb, the answer is
- "It depends." While the optimal size depends on anticipated
+ "It depends." Although the optimal size depends on anticipated
load and average database transaction time, the optimum
connection pool size is smaller than you might expect. If you
take Sun's Java Petstore blueprint application for example, a
Modified: trunk/refman-5.1/connector-net.xml
===================================================================
--- trunk/refman-5.1/connector-net.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/connector-net.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -3883,7 +3883,7 @@
<title>Handling Invalid Dates</title>
<para>
- While it is strongly recommended that you avoid the use of
+ Although it is strongly recommended that you avoid the use of
invalid dates within your .NET application, it is possible to
use invalid dates by means of the
<literal>MySqlDateTime</literal> datatype.
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/functions.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -10587,7 +10587,7 @@
<listitem>
<para>
- While the use of multiple character sets within a single
+ Although the use of multiple character sets within a single
table is supported, all columns in a
<literal>FULLTEXT</literal> index must use the same
character set and collation.
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/installing.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -4103,7 +4103,7 @@
<filename>my.ini</filename> file located in the server
installation directory. To configure the client and utility
applications, create a new <filename>my.ini</filename> file in
- the <filename>C:\Windows</filename> or
+ the <filename>C:\WINDOWS</filename> or
<filename>C:\WINNT</filename> directory as is applicable to
your Windows version.
</para>
@@ -5255,7 +5255,7 @@
other than <literal>mysql</literal> when using the
configuration wizard. This will allow the new service to be
installed correctly, but leaves the outdated service in
- place. While this is harmless it is best to remove old
+ place. Although this is harmless, it is best to remove old
services that are no longer in use.
</para>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/introduction.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -403,7 +403,7 @@
<emphasis role="bold">Plugin API</emphasis>: MySQL 5.1 adds
support for a very flexible plugin API that enables loading
and unloading of various components at runtime, without
- restarting the server. While the work on this is not
+ restarting the server. Although the work on this is not
finished yet, <emphasis>plugin full-text parsers</emphasis>
are a first step in this direction. This allows users to
implement their own input filter on the indexed text,
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/ndbcluster.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -506,7 +506,7 @@
</orderedlist>
<para>
- While we refer to a Linux operating system in this How-To, the
+ Although we refer to a Linux operating system in this How-To, the
instructions and procedures that we provide here should be easily
adaptable to either Solaris or Mac OS X. We also assume that you
already know how to perform a minimal installation and
@@ -1015,7 +1015,7 @@
<para>
Starting the cluster is not very difficult once it has been
configured. Each cluster node process must be started
- separately, and on the host where it resides. While it is
+ separately, and on the host where it resides. Although it is
possible to start the nodes in any order, it is recommended that
the management node be started first, followed by the storage
nodes, and then finally by any SQL nodes:
@@ -1910,7 +1910,7 @@
<para>
We are continuously making improvements in Cluster configuration
- and attempting to simplify this process. While we strive to
+ and attempting to simplify this process. Although we strive to
maintain backward compatibility, there may be times when
introduce an incompatible change. In such cases we will try to
let Cluster users know in advance if a change is not backward
@@ -3411,7 +3411,7 @@
<para>
This is an internal buffer used for passing messages
- within individual nodes and between nodes. While it is
+ within individual nodes and between nodes. Although it is
highly unlikely that this would need to be changed, it is
configurable. By default it is set to 1MB.
</para>
@@ -8009,7 +8009,7 @@
<para>
<literal>NDB</literal> does not support repeatable reads,
- which can cause problems with the restoration process. While
+ which can cause problems with the restoration process. Although
the backup process is <quote>hot</quote>, restoring a MySQL
Cluster from backup is not a 100% <quote>hot</quote> process.
This is due to the fact that, for the duration of the restore
@@ -8059,7 +8059,7 @@
being the recipient of these. In MySQL Cluster, replication is
conceptually very similar but can be more complex in practise, as it
may be extended to cover a number of different configurations
- including replicating between two complete clusters. While a MySQL
+ including replicating between two complete clusters. Although a MySQL
Cluster itself depends on the <literal>NDB Cluster</literal> storage
engine for clustering functionality, it is not necessary to use the
Cluster storage engine on the slave. However, for maximum
@@ -8192,7 +8192,7 @@
servers on both the master and slave clusters sharing the same
ID). This can be done by starting each SQL node using the
<option>&ddash;server-id=<replaceable>id</replaceable></option> option,
- where <replaceable>id</replaceable> is a unique integer. While it is
+ where <replaceable>id</replaceable> is a unique integer. Although it is
not strictly necessary, we will assume for purposes of this
discussion that all MySQL installations are the same version.
</para>
@@ -11306,7 +11306,7 @@
</para>
<para>
- No. While some specialized commands are used to manage and
+ No. Although some specialized commands are used to manage and
configure the cluster itself, only standard (My)SQL queries
and commands are required for:
</para>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/replication.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -207,7 +207,7 @@
Due to these limitations, we recommend that at this point you use
<literal>LOAD DATA FROM MASTER</literal> only if the dataset on
the master is relatively small, or if a prolonged read lock on the
- master is acceptable. While the actual speed of <literal>LOAD DATA
+ master is acceptable. Although the actual speed of <literal>LOAD DATA
FROM MASTER</literal> may vary from system to system, a good rule
of thumb for how long it takes is 1 second per 1MB of data. This
is a rough estimate, but you should find it fairly accurate if
@@ -1079,7 +1079,7 @@
</para>
<para>
- While this method is the most straightforward way to set up a
+ Although this method is the most straightforward way to set up a
slave, it is not the only one. For example, if you have a snapshot
of the master's data, and the master has its server ID set and
binary logging enabled, you can set up a slave without shutting
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -9570,7 +9570,7 @@
In previous versions of MySQL (prior to MySQL 4.1), only
nested queries of the form <literal>INSERT ... SELECT
...</literal> and <literal>REPLACE ... SELECT ...</literal>
- were supported. While this is not the case in MySQL
+ were supported. Although this is not the case in MySQL
¤t-series;, it is still true that there are sometimes
other ways to test membership in a set of values. It is also
true that on some occasions, it is not only possible to
Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/storage-engines.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -274,7 +274,7 @@
</programlisting>
<para>
- While <literal>TYPE</literal> is still supported in MySQL
+ Although <literal>TYPE</literal> is still supported in MySQL
¤t-series;, <literal>ENGINE</literal> is now the preferred
term.
</para>
Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-5.1/tutorial.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -3301,7 +3301,7 @@
response to actions taken on rows in the table which you are
defining; in other words, this syntax induces no <literal>ON
DELETE</literal> or <literal>ON UPDATE</literal> behavior
- whatsoever. (While you can write an <literal>ON
+ whatsoever. (Although you can write an <literal>ON
DELETE</literal> or <literal>ON UPDATE</literal> clause as
part of the <literal>REFERENCES</literal> clause, it is also
ignored.)
Modified: trunk/refman-common/bug-reports.xml
===================================================================
--- trunk/refman-common/bug-reports.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-common/bug-reports.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -156,10 +156,9 @@
</para>
<para>
- All bugs posted in the bugs database at
- <ulink url="http://bugs.mysql.com/"/> are corrected or documented in
- the next MySQL release. If only minor code changes are needed to
- correct a problem, we may also post a patch that fixes the problem.
+ Bugs posted in the bugs database at
+ <ulink url="http://bugs.mysql.com/"/> that are corrected for a given
+ release are noted in the change history.
</para>
<para>
@@ -528,7 +527,9 @@
If you are running Windows, please verify the value of
<literal>lower_case_table_names</literal> using the
<literal>SHOW VARIABLES LIKE 'lower_case_table_names'</literal>
- command.
+ command. This variable affects how the server handles lettercase
+ of database and table names. Its effect for a given value should
+ be as described in <xref linkend="name-case-sensitivity"/>.
</para>
</listitem>
@@ -563,6 +564,11 @@
</itemizedlist>
+ <remark role="note">
+ Following is irrelevant now?
+ </remark>
+
+<!--
<indexterm type="concept">
<primary>technical support</primary>
<secondary>mailing address</secondary>
@@ -589,6 +595,7 @@
treatment, as well as to the appropriate mailing list to see whether
someone else has experienced (and perhaps solved) the problem.
</para>
+-->
<indexterm type="concept">
<primary><command>mysqlbug</command> script</primary>
Modified: trunk/refman-common/credits.xml
===================================================================
--- trunk/refman-common/credits.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-common/credits.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -1164,7 +1164,7 @@
</indexterm>
<para>
- While MySQL AB owns all copyrights in the <literal>MySQL
+ Although MySQL AB owns all copyrights in the <literal>MySQL
server</literal> and the <literal>MySQL manual</literal>, we wish
to recognize those who have made contributions of one kind or
another to the <literal>MySQL distribution</literal>. Contributors
@@ -2377,7 +2377,7 @@
</indexterm>
<para>
- While MySQL AB owns all copyrights in the <literal>MySQL
+ Although MySQL AB owns all copyrights in the <literal>MySQL
server</literal> and the <literal>MySQL manual</literal>, we wish
to recognize the following companies, which helped us finance the
development of the <literal>MySQL server</literal>, such as by
Modified: trunk/refman-common/news-4.0.xml
===================================================================
--- trunk/refman-common/news-4.0.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-common/news-4.0.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -4941,7 +4941,7 @@
On a slave, <literal>LOAD DATA INFILE</literal> which had no
<literal>IGNORE</literal> or <literal>REPLACE</literal> clause
on the master, was replicated with <literal>IGNORE</literal>.
- While this is not a problem if the master and slave data are
+ Although this is not a problem if the master and slave data are
identical (a <literal>LOAD</literal> that produces no
duplicate conflicts on the master produces none on the slave
anyway), which is true in normal operation, it is better for
Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml 2006-01-06 20:26:18 UTC (rev 708)
+++ trunk/refman-common/news-5.1.xml 2006-01-06 20:26:32 UTC (rev 709)
@@ -447,7 +447,7 @@
<para>
This is the first public alpha release of the current MySQL 5.1
development branch, providing an insight to upcoming features.
- While some of these are still under heavy development, this
+ Although some of these are still under heavy development, this
release includes the following new features and changes (in
comparison to the current MySQL 5.0 production release):
</para>
@@ -472,7 +472,7 @@
<emphasis role="bold">Plugin API</emphasis>: MySQL 5.1 adds
support for a very flexible plugin API that enables loading
and unloading of various components at runtime, without
- restarting the server. While the work on this is not finished
+ restarting the server. Although the work on this is not finished
yet, <emphasis>plugin full-text parsers</emphasis> are a first
step in this direction. This allows users to implement their
own input filter on the indexed text, enabling full-text
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r709 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 6 Jan |
