Author: paul
Date: 2005-12-20 19:52:00 +0100 (Tue, 20 Dec 2005)
New Revision: 603
Log:
r4964@frost: paul | 2005-12-20 12:26:10 -0600
Fix typos, use U.S. English. (Bug#15875)
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/charset.xml
trunk/refman-4.1/client-side-scripts.xml
trunk/refman-4.1/connector-j.xml
trunk/refman-4.1/connector-mxj.xml
trunk/refman-4.1/connector-net.xml
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/extending-mysql.xml
trunk/refman-4.1/functions.xml
trunk/refman-4.1/ndbcluster.xml
trunk/refman-4.1/problems.xml
trunk/refman-4.1/replication.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/apis.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.0/client-side-scripts.xml
trunk/refman-5.0/connector-j.xml
trunk/refman-5.0/connector-mxj.xml
trunk/refman-5.0/connector-net.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/extending-mysql.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/precision-math.xml
trunk/refman-5.0/problems.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.0/restrictions.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/stored-procedures.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/charset.xml
trunk/refman-5.1/client-side-scripts.xml
trunk/refman-5.1/connector-j.xml
trunk/refman-5.1/connector-mxj.xml
trunk/refman-5.1/connector-net.xml
trunk/refman-5.1/custom-engine.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/extending-mysql.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/ndbcluster.xml
trunk/refman-5.1/precision-math.xml
trunk/refman-5.1/problems.xml
trunk/refman-5.1/replication.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-common/credits.xml
trunk/refman-common/news-4.1.xml
trunk/refman-common/news-5.0.xml
trunk/refman-common/news-cluster.xml
trunk/refman-common/news-connector-j.xml
trunk/refman-common/news-connector-net.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4925
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1694
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4964
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1694
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/apis.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -4026,7 +4026,7 @@
<para>
This function is used to create a legal SQL string that you
- can use in a SQL statement. See
+ can use in an SQL statement. See
<xref linkend="string-syntax"/>.
</para>
@@ -6330,7 +6330,7 @@
<para>
This function is used to create a legal SQL string that you
- can use in a SQL statement. See
+ can use in an SQL statement. See
<xref linkend="string-syntax"/>.
</para>
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/charset.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -4258,7 +4258,7 @@
However, the meaning of <quote>SHIFT JIS</quote> as a
descriptive term has become very vague and it often includes
the extensions to <literal>Shift_JIS</literal> that are
- defined by various venders.
+ defined by various vendors.
</para>
<para>
Modified: trunk/refman-4.1/client-side-scripts.xml
===================================================================
--- trunk/refman-4.1/client-side-scripts.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/client-side-scripts.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -2282,7 +2282,7 @@
prompt (\R) Change your mysql prompt.
quit (\q) Quit mysql.
rehash (\#) Rebuild completion hash.
-source (\.) Execute a SQL script file. Takes a file name as an argument.
+source (\.) Execute an SQL script file. Takes a file name as an argument.
status (\s) Get status information from the server.
system (\!) Execute a system shell command.
tee (\T) Set outfile [to_outfile]. Append everything into given outfile.
Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/connector-j.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1227,7 +1227,7 @@
behavior can be modified using the '
<property>zeroDateTimeBehavior</property> ' configuration
property. The allowable values are: 'exception' (the
- default), which throws a SQLException with a SQLState of
+ default), which throws an SQLException with an SQLState of
'S1009', 'convertToNull', which returns NULL instead of
the date, and 'round', which rounds the date to the
nearest closest value which is '0001-01-01'.
@@ -4280,7 +4280,7 @@
<question>
<para>
- My application throws a SQLException 'No Suitable Driver'.
+ My application throws an SQLException 'No Suitable Driver'.
Why is this happening?
</para>
Modified: trunk/refman-4.1/connector-mxj.xml
===================================================================
--- trunk/refman-4.1/connector-mxj.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/connector-mxj.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -458,7 +458,7 @@
The MysqldResource will allow you to "start" MySQL with a
java.util.Map of server options which you provide, as well as
"shutdown" the database. The following example shows a simplistic
- way to embed MySQL in an applicaiton using plain java objects:
+ way to embed MySQL in an application using plain java objects:
</para>
<programlisting>
Modified: trunk/refman-4.1/connector-net.xml
===================================================================
--- trunk/refman-4.1/connector-net.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/connector-net.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -202,7 +202,7 @@
<listitem>
<para>
- <literal>MySqlCommand</literal>: Represents a SQL statement to
+ <literal>MySqlCommand</literal>: Represents an SQL statement to
execute against a MySQL database.
</para>
</listitem>
@@ -253,7 +253,7 @@
<listitem>
<para>
- <literal>MySqlTransaction</literal>: Represents a SQL
+ <literal>MySqlTransaction</literal>: Represents an SQL
transaction to be made in a MySQL database.
</para>
</listitem>
@@ -274,7 +274,7 @@
<title>The MySqlCommand Class</title>
<para>
- The <literal>MySqlCommand</literal> class represents a SQL
+ The <literal>MySqlCommand</literal> class represents an SQL
statement to execute against a MySQL database.
</para>
@@ -410,7 +410,7 @@
<listitem>
<para>
- <literal>ExecuteNonQuery</literal>: Executes a SQL
+ <literal>ExecuteNonQuery</literal>: Executes an SQL
statement against the connection and returns the number of
rows affected.
</para>
@@ -455,7 +455,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-command-usage-vbnet">
@@ -684,7 +684,7 @@
The following example uses the MySqlCommand, along
MySqlDataAdapter and MySqlConnection, to select rows from a
data source. The example is passed an initialized DataSet, a
- connection string, a query string that is a SQL SELECT
+ connection string, a query string that is an SQL SELECT
statement, and a string that is the name of the database
table. The example then creates a MySqlCommandBuilder.
</para>
@@ -936,7 +936,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-connection-usage-vb">
@@ -1074,7 +1074,7 @@
<listitem>
<para>
- <literal>DeleteCommand</literal>: Gets or sets a SQL
+ <literal>DeleteCommand</literal>: Gets or sets an SQL
statement or stored procedure used to delete records from
the data set.
</para>
@@ -1082,7 +1082,7 @@
<listitem>
<para>
- <literal>InsertCommand</literal>: Gets or sets a SQL
+ <literal>InsertCommand</literal>: Gets or sets an SQL
statement or stored procedure used to insert records into
the data set.
</para>
@@ -1106,7 +1106,7 @@
<listitem>
<para>
- <literal>SelectCommand</literal>: Gets or sets a SQL
+ <literal>SelectCommand</literal>: Gets or sets an SQL
statement or stored procedure used to select records in
the data source.
</para>
@@ -1122,7 +1122,7 @@
<listitem>
<para>
- <literal>UpdateCommand</literal>: Gets or sets a SQL
+ <literal>UpdateCommand</literal>: Gets or sets an SQL
statement or stored procedure used to updated records in
the data source.
</para>
@@ -1192,7 +1192,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-adapter-usage-vb">
@@ -1939,7 +1939,7 @@
<title>The MySqlTransaction Class</title>
<para>
- Represents a SQL transaction to be made in a MySQL database.
+ Represents an SQL transaction to be made in a MySQL database.
</para>
<section id="connector-net-architecture-transaction-properties">
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/data-types.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1192,7 +1192,7 @@
<listitem>
<para>
Character column sorting and comparison are based on the
- character set assigned to the column. For earalier versions,
+ character set assigned to the column. For earlier versions,
sorting and comparison are based on the collation of the
server character set. For <literal>CHAR</literal> and
<literal>VARCHAR</literal> columns, you can declare the
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/database-administration.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -16902,7 +16902,7 @@
<para>
To be able to restore data from a binary log, you will need to
know the path and name of the current binary log file. The path
- can tyically be found in the options file (that is,
+ can typically be found in the options file (that is,
<filename>my.cnf</filename> or <filename>my.ini</filename>,
depending on your system). If it is not contained in the options
file, it may be given as an option at the command-line when the
@@ -21574,7 +21574,7 @@
least one successfully committed <literal>InnoDB</literal>
transaction), which should not happen if
<literal>sync_binlog=1</literal> and the disk and filesystem
- actually synchronise when requested (some do not), the server
+ actually synchronize when requested (some do not), the server
prints the error message <literal>The binary log
<<replaceable>name</replaceable>> is shorter than its
expected size</literal>. In this case, this binary log is not
Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/extending-mysql.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -241,7 +241,7 @@
A test case consists of <literal>;</literal> terminated
statements and is similar to the input of
<command>mysql</command> command-line client. A statement
- by default is a SQL statment to be sent to MySQL server,
+ by default is an SQL statement to be sent to MySQL server,
unless it is recognized as internal command (for example,
<command>sleep</command>).
</para>
@@ -605,7 +605,7 @@
<para>
The MySQL interface for user-defined functions provides the
- following features and capabilties:
+ following features and capabilities:
</para>
<itemizedlist>
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/functions.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -12666,7 +12666,7 @@
The row count available through
<literal>FOUND_ROWS()</literal> is transient and not
intended to be available past the statement following the
- <literal>SELECT SQL_CALC_FOUND_ROWS</literal> statment. If
+ <literal>SELECT SQL_CALC_FOUND_ROWS</literal> statement. If
you need to refer to the value later, save it:
</para>
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/ndbcluster.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -254,7 +254,7 @@
Configuration of a cluster involves configuring each individual
node in the cluster and setting up individual communication links
between nodes. MySQL Cluster is currently designed with the
- intention that storage nodes are homogenous in terms of processor
+ intention that storage nodes are homogeneous in terms of processor
power, memory space, and bandwidth. In addition, in order to
provide a single point of configuration, all configuration data
for the cluster as a whole is located in one configuration file.
@@ -468,7 +468,7 @@
Standard 100 Mbps or 1 gigabit Ethernet cards are installed on
each machine, along with the proper drivers for the cards, and
that all 4 hosts are connected via a standard-issue Ethernet
- networking applicance such as a switch. (All machines should
+ networking appliance such as a switch. (All machines should
use network cards with the same throughout; that is, all 4
machines in the cluster should have 100 Mbps cards
<emphasis>or</emphasis> all 4 machines should have 1 Gbps
@@ -2492,7 +2492,7 @@
<listitem>
<para>
<literal>2</literal>: Indicates a low-priority node
- which be used as an arbtrator only if a node with a
+ which be used as an arbitrator only if a node with a
higher priority is not available for that purpose.
</para>
</listitem>
@@ -3934,7 +3934,7 @@
<para>
The default interval is 1500 milliseconds (1.5 seconds).
- This interval can vary between indidivual data nodes
+ This interval can vary between individual data nodes
because each storage node watches the MySQL servers
connected to it, independently of all other data nodes.
</para>
@@ -4383,7 +4383,7 @@
<para>
By default, only the startup message is sent to
- <literal>stdout</literal>, with the reaimaining event
+ <literal>stdout</literal>, with the remaining event
reporting level defaults being set to 0. The reason for this
is that these messages are also sent to the management
server's cluster log.
@@ -6000,7 +6000,7 @@
Instructs <command>ndbd</command> not to start
automatically. When this option is used,
<command>ndbd</command> connects to the management server,
- obtains configuration data from it, and initialises
+ obtains configuration data from it, and initializes
communication objects. However, it will not actually start
the execution engine until specifically requested to do so
by the management server. This can be accomplished by
@@ -6192,7 +6192,7 @@
<para>
<emphasis role="bold">Initial Node Restart</emphasis>:
This is the same as a node restart, except that the node
- is reinitialised and started with a clean filesystem.
+ is reinitialized and started with a clean filesystem.
</para>
</listitem>
@@ -6201,7 +6201,7 @@
<para>
Prior to startup, each data node (<literal>ndbd</literal>
- process) must be initialised. This consists of the following:
+ process) must be initialized. This consists of the following:
<orderedlist>
@@ -6226,7 +6226,7 @@
<listitem>
<para>
Allocate memory according to settings obtained from the
- cofiguration file.
+ configuration file.
</para>
</listitem>
@@ -6234,7 +6234,7 @@
</para>
<para>
- Once each data node has been initialised, the cluster startup
+ Once each data node has been initialized, the cluster startup
process can proceed. The stages which the cluster goes through
during this process are listed here:
@@ -6284,7 +6284,7 @@
</para>
<para>
- This stage consists of the initialisation of a number of
+ This stage consists of the initialization of a number of
internal cluster variables.
</para>
</listitem>
@@ -6358,13 +6358,13 @@
<listitem>
<para>
The node's schema is compared with the
- master' and synchronised with it.
+ master' and synchronized with it.
</para>
</listitem>
<listitem>
<para>
- Synchronise data received in the form of
+ Synchronize data received in the form of
<literal>INSERT</literal> from the other data nodes
in this node's node group.
</para>
@@ -6968,7 +6968,7 @@
</para>
<para>
- The logging messages shown below are assocated with
+ The logging messages shown below are associated with
checkpoints.
</para>
@@ -8474,7 +8474,7 @@
determining whether or not SCI is enabled should be fairly
simple from observing the latency.
(<emphasis role="bold">Note</emphasis>: Before using
- <command>latency_bench</command>, it is necessaryto set the
+ <command>latency_bench</command>, it is necessary to set the
<literal>LD_PRELOAD</literal> environment variable as shown
later in this section.)
</para>
@@ -8856,7 +8856,7 @@
<para>
Database memory size and index memory size
(<literal>DataMemory</literal> and
- <literal>IndexMemory</literal>, repectively).
+ <literal>IndexMemory</literal>, respectively).
</para>
</listitem>
@@ -9383,7 +9383,7 @@
systems. We have had reports from users who say that they have
run Cluster successfully on FreeBSD. However, Cluster on any
but the three platforms mentioned here should be considered
- alpha software (at best), cannot be guaranteed relaiable in a
+ alpha software (at best), cannot be guaranteed reliable in a
production setting, and <emphasis>is not supported by MySQL
AB</emphasis>.
</para>
@@ -9403,7 +9403,7 @@
Cluster should run on any platform for which NDB-enabled
binaries are available. Naturally, faster CPUs and more memory
will improve performance, and 64-bit CPUs will likely be more
- effective than 32-bit processors. There must be sufficent
+ effective than 32-bit processors. There must be sufficient
memory on machines used for data nodes to hold each node's
share of the database (see <emphasis role="bold">How much RAM
do I Need?</emphasis> for more info). Nodes can communicate
@@ -9680,7 +9680,7 @@
unique indexes will generally cause table updates to run
more quickly. This is due to the fact that less memory is
required (since no ordered indexes are created), and that
- less CPU must be utilised (since fewer indexes must be
+ less CPU must be utilized (since fewer indexes must be
read and possibly updated).
</para>
</listitem>
@@ -10014,7 +10014,7 @@
All cluster nodes recognise the same node as the arbitrator,
which is normally the management server; however, it is
possible to configure any of the MySQL Servers in the cluster
- to act as the arbirtrator instead. The arbitrator accepts the
+ to act as the arbitrator instead. The arbitrator accepts the
first set of cluster nodes to contact it, and tells the
remaining set to shut down. Arbitrator selection is controlled
by the <literal>ArbitrationRank</literal> configuration
@@ -10022,7 +10022,7 @@
<xref linkend="mysql-cluster-mgm-definition"/> for details.)
It should also be noted that the role of arbitrator does not
in and of itself impose any heavy demands upon the host so
- designated, and thus the artitrator host does not need to be
+ designated, and thus the arbitrator host does not need to be
particularly fast or to have extra memory especially for this
purpose.
</para>
@@ -10346,7 +10346,7 @@
<para>
A GCP occurs every few seconds, when transactions for all
- nodes are synchronised and the redo-log is flushed to
+ nodes are synchronized and the redo-log is flushed to
disk.
</para>
</listitem>
@@ -10529,7 +10529,7 @@
</para>
<para>
- The process of restarting the cluster and reinitialising its
+ The process of restarting the cluster and reinitializing its
state from disk logs and checkpoints. This is required after
either a planned or an unplanned shutdown of the cluster.
</para>
@@ -10833,7 +10833,7 @@
<para>
Under normal circumstances, it is necessary and sufficient to
keep and examine only the cluster log. The node logs need be
- comsulted only for application development and debugging
+ consulted only for application development and debugging
purposes.
</para>
</listitem>
Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/problems.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -516,7 +516,7 @@
ports to the user. After any port is closed it will remain in
a <literal>TIME_WAIT</literal> status for 120 seconds. This
status allows the connection to be reused at a much lower cost
- than re-initialising a brand new connection. However, the port
+ than reinitializing a brand new connection. However, the port
will not be available again until this time expires.
</para>
@@ -3455,7 +3455,7 @@
<literal>=</literal>, <literal>>=</literal>,
<literal>></literal>, or <literal>BETWEEN</literal>
operators, MySQL normally converts the string to an internal
- long integer for faster comparision (and also for a bit more
+ long integer for faster comparison (and also for a bit more
<quote>relaxed</quote> string checking). However, this
conversion is subject to the following exceptions:
</para>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/replication.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -991,7 +991,7 @@
can use to connect. This account must be given the
<literal>REPLICATION SLAVE</literal> privilege. If the account
is used only for replication (which is recommended), you don't
- need to grant any additional privileges. (For informaiton
+ need to grant any additional privileges. (For information
about setting up user accounts and privileges, see
<xref linkend="user-account-management"/>.)
</para>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-4.1/sql-syntax.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -7331,7 +7331,7 @@
<para>
Also, if a column to be sorted is aliased, the <literal>ORDER
BY</literal> clause must refer to the alias, not the column
- name. The first of the following statments will work, but the
+ name. The first of the following statements will work, but the
second will fail with an <literal>Unknown column 'a' in 'order
clause'</literal> error:
</para>
@@ -11094,7 +11094,7 @@
<para>
<literal>REQUIRE CIPHER
'<replaceable>cipher</replaceable>'</literal> is needed to
- ensure thatciphers and key lengths of sufficient strength
+ ensure that ciphers and key lengths of sufficient strength
are used. SSL itself can be weak if old algorithms using
short encryption keys are used. Using this option, you can
ask that a specific cipher method is used to allow a
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/apis.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -4089,7 +4089,7 @@
<para>
This function is used to create a legal SQL string that you
- can use in a SQL statement. See
+ can use in an SQL statement. See
<xref linkend="string-syntax"/>.
</para>
@@ -6379,7 +6379,7 @@
<para>
This function is used to create a legal SQL string that you
- can use in a SQL statement. See
+ can use in an SQL statement. See
<xref linkend="string-syntax"/>.
</para>
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/charset.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -3583,7 +3583,7 @@
However, the meaning of <quote>SHIFT JIS</quote> as a
descriptive term has become very vague and it often includes
the extensions to <literal>Shift_JIS</literal> that are
- defined by various venders.
+ defined by various vendors.
</para>
<para>
Modified: trunk/refman-5.0/client-side-scripts.xml
===================================================================
--- trunk/refman-5.0/client-side-scripts.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/client-side-scripts.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -2268,7 +2268,7 @@
prompt (\R) Change your mysql prompt.
quit (\q) Quit mysql.
rehash (\#) Rebuild completion hash.
-source (\.) Execute a SQL script file. Takes a file name as an argument.
+source (\.) Execute an SQL script file. Takes a file name as an argument.
status (\s) Get status information from the server.
system (\!) Execute a system shell command.
tee (\T) Set outfile [to_outfile]. Append everything into given outfile.
Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/connector-j.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1227,7 +1227,7 @@
behavior can be modified using the '
<property>zeroDateTimeBehavior</property> ' configuration
property. The allowable values are: 'exception' (the
- default), which throws a SQLException with a SQLState of
+ default), which throws an SQLException with an SQLState of
'S1009', 'convertToNull', which returns NULL instead of
the date, and 'round', which rounds the date to the
nearest closest value which is '0001-01-01'.
@@ -4280,7 +4280,7 @@
<question>
<para>
- My application throws a SQLException 'No Suitable Driver'.
+ My application throws an SQLException 'No Suitable Driver'.
Why is this happening?
</para>
Modified: trunk/refman-5.0/connector-mxj.xml
===================================================================
--- trunk/refman-5.0/connector-mxj.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/connector-mxj.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -458,7 +458,7 @@
The MysqldResource will allow you to "start" MySQL with a
java.util.Map of server options which you provide, as well as
"shutdown" the database. The following example shows a simplistic
- way to embed MySQL in an applicaiton using plain java objects:
+ way to embed MySQL in an application using plain java objects:
</para>
<programlisting>
Modified: trunk/refman-5.0/connector-net.xml
===================================================================
--- trunk/refman-5.0/connector-net.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/connector-net.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -223,7 +223,7 @@
<listitem>
<para>
- <literal>MySqlCommand</literal>: Represents a SQL statement to
+ <literal>MySqlCommand</literal>: Represents an SQL statement to
execute against a MySQL database.
</para>
</listitem>
@@ -274,7 +274,7 @@
<listitem>
<para>
- <literal>MySqlTransaction</literal>: Represents a SQL
+ <literal>MySqlTransaction</literal>: Represents an SQL
transaction to be made in a MySQL database.
</para>
</listitem>
@@ -295,7 +295,7 @@
<title>The MySqlCommand Class</title>
<para>
- The <literal>MySqlCommand</literal> class represents a SQL
+ The <literal>MySqlCommand</literal> class represents an SQL
statement to execute against a MySQL database.
</para>
@@ -431,7 +431,7 @@
<listitem>
<para>
- <literal>ExecuteNonQuery</literal>: Executes a SQL
+ <literal>ExecuteNonQuery</literal>: Executes an SQL
statement against the connection and returns the number of
rows affected.
</para>
@@ -476,7 +476,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-command-usage-vbnet">
@@ -705,7 +705,7 @@
The following example uses the MySqlCommand, along
MySqlDataAdapter and MySqlConnection, to select rows from a
data source. The example is passed an initialized DataSet, a
- connection string, a query string that is a SQL SELECT
+ connection string, a query string that is an SQL SELECT
statement, and a string that is the name of the database
table. The example then creates a MySqlCommandBuilder.
</para>
@@ -957,7 +957,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-connection-usage-vb">
@@ -1095,7 +1095,7 @@
<listitem>
<para>
- <literal>DeleteCommand</literal>: Gets or sets a SQL
+ <literal>DeleteCommand</literal>: Gets or sets an SQL
statement or stored procedure used to delete records from
the data set.
</para>
@@ -1103,7 +1103,7 @@
<listitem>
<para>
- <literal>InsertCommand</literal>: Gets or sets a SQL
+ <literal>InsertCommand</literal>: Gets or sets an SQL
statement or stored procedure used to insert records into
the data set.
</para>
@@ -1127,7 +1127,7 @@
<listitem>
<para>
- <literal>SelectCommand</literal>: Gets or sets a SQL
+ <literal>SelectCommand</literal>: Gets or sets an SQL
statement or stored procedure used to select records in
the data source.
</para>
@@ -1143,7 +1143,7 @@
<listitem>
<para>
- <literal>UpdateCommand</literal>: Gets or sets a SQL
+ <literal>UpdateCommand</literal>: Gets or sets an SQL
statement or stored procedure used to updated records in
the data source.
</para>
@@ -1213,7 +1213,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-adapter-usage-vb">
@@ -1960,7 +1960,7 @@
<title>The MySqlTransaction Class</title>
<para>
- Represents a SQL transaction to be made in a MySQL database.
+ Represents an SQL transaction to be made in a MySQL database.
</para>
<section id="connector-net-architecture-transaction-properties">
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/data-types.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1197,7 +1197,7 @@
<listitem>
<para>
Character column sorting and comparison are based on the
- character set assigned to the column. For earalier versions,
+ character set assigned to the column. For earlier versions,
sorting and comparison are based on the collation of the
server character set. For <literal>CHAR</literal> and
<literal>VARCHAR</literal> columns, you can declare the
@@ -2890,7 +2890,7 @@
created with <literal>MAXDB</literal> mode enabled. (As noted
above, <literal>MAXDB</literal> mode causes columns to be
created as <literal>DATETIME</literal> columns.) The rules
- governing initialisation and updating of
+ governing initialization and updating of
<literal>TIMESTAMP</literal> columns are as follows:
</para>
@@ -3233,7 +3233,7 @@
<literal>TIME</literal> column. Without colons, MySQL interprets
values using the assumption that the two rightmost digits
represent seconds. (MySQL interprets <literal>TIME</literal>
- valuesas elapsed time rather than as time of day.) For example,
+ values as elapsed time rather than as time of day.) For example,
you might think of <literal>'1112'</literal> and
<literal>1112</literal> as meaning <literal>'11:12:00'</literal>
(12 minutes after 11 o'clock), but MySQL interprets them as
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/database-administration.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -8498,11 +8498,11 @@
log. Note that there is one write to the binary log per
statement if in autocommit mode, and otherwise one write
per transaction. The default value is 0 which does no
- synchronising to disk. A value of 1 is the safest choice,
+ synchronizing to disk. A value of 1 is the safest choice,
because in the event of a crash you lose at most one
statement/transaction from the binary log; however, it is
also the slowest choice (unless the disk has a
- battery-backed cache, which makes synchronisation very
+ battery-backed cache, which makes synchronization very
fast).
</para>
</listitem>
@@ -8515,7 +8515,7 @@
<para>
If this variable is set to 1, then when a non-temporary
table is created its <filename>.frm</filename> file is
- synchronised to disk (<literal>fdatasync()</literal>);
+ synchronized to disk (<literal>fdatasync()</literal>);
this is slower but safer in case of a crash. The default
is 1.
</para>
@@ -16330,7 +16330,7 @@
<para>
MySQL usernames can be up to a maximum of 16 characters
long. This limit is hard-coded in the MySQL servers and
- clients, and trying to cirumvent it by modifying the
+ clients, and trying to circumvent it by modifying the
definitions of the tables in the <literal>mysql</literal>
database <emphasis>does not work</emphasis>.
</para>
@@ -19092,7 +19092,7 @@
<para>
To be able to restore data from a binary log, you will need to
know the path and name of the current binary log file. The path
- can tyically be found in the options file (that is,
+ can typically be found in the options file (that is,
<filename>my.cnf</filename> or <filename>my.ini</filename>,
depending on your system). If it's not contained in the options
file, it may be given as an option at the command-line when the
Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/extending-mysql.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -232,7 +232,7 @@
A test case consists of <literal>;</literal> terminated
statements and is similar to the input of
<command>mysql</command> command-line client. A statement
- by default is a SQL statment to be sent to MySQL server,
+ by default is an SQL statement to be sent to MySQL server,
unless it is recognized as internal command (for example,
<command>sleep</command>).
</para>
@@ -600,7 +600,7 @@
<para>
The MySQL interface for user-defined functions provides the
- following features and capabilties:
+ following features and capabilities:
</para>
<itemizedlist>
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/functions.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -13834,7 +13834,7 @@
Returns the average value of
<literal><replaceable>expr</replaceable></literal>. The
<literal>DISTINCT</literal> option can be used as of MySQL
- 5.0.3 to return the averge of the distinct values of
+ 5.0.3 to return the average of the distinct values of
<replaceable>expr</replaceable>.
</para>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/installing.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -556,7 +556,7 @@
<para>
MySQL &next-series; is the next development release series
and is the series in which new features are to be
- implemented. Alpha releases will be made avilable in the
+ implemented. Alpha releases will be made available in the
near future to allow widespread testing by interested
users.
</para>
@@ -4614,7 +4614,7 @@
</remark>
<para>
- The informaiton in this section applies primarily if you
+ The information in this section applies primarily if you
installed MySQL using the <literal>Noinstall</literal> version,
or if you wish to configure and test MySQL manually rather than
with the GUI tools.
@@ -14359,7 +14359,7 @@
</para>
<para>
- In the MySQL benchmarks, we obtained a 4% speed incrase on
+ In the MySQL benchmarks, we obtained a 4% speed increase on
UltraSPARC when using Forte 5.0 in 32-bit mode, as compared to
using <command>gcc</command> 3.2 with the <option>-mcpu</option>
flag.
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/introduction.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -604,7 +604,7 @@
The <literal>VARCHAR</literal> data type as implemented
in MySQL 5.0 is more efficient than in previous
versions, due to the elimination of the old (and
- nonstandard) removal of trailing spaces during retrival.
+ nonstandard) removal of trailing spaces during retrieval.
</para>
</listitem>
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/ndbcluster.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -260,7 +260,7 @@
Configuration of a cluster involves configuring each individual
node in the cluster and setting up individual communication links
between nodes. MySQL Cluster is currently designed with the
- intention that storage nodes are homogenous in terms of processor
+ intention that storage nodes are homogeneous in terms of processor
power, memory space, and bandwidth. In addition, in order to
provide a single point of configuration, all configuration data
for the cluster as a whole is located in one configuration file.
@@ -474,7 +474,7 @@
Standard 100 Mbps or 1 gigabit Ethernet cards are installed on
each machine, along with the proper drivers for the cards, and
that all 4 hosts are connected via a standard-issue Ethernet
- networking applicance such as a switch. (All machines should
+ networking appliance such as a switch. (All machines should
use network cards with the same throughout; that is, all 4
machines in the cluster should have 100 Mbps cards
<emphasis>or</emphasis> all 4 machines should have 1 Gbps
@@ -2490,7 +2490,7 @@
<listitem>
<para>
<literal>2</literal>: Indicates a low-priority node
- which be used as an arbtrator only if a node with a
+ which be used as an arbitrator only if a node with a
higher priority is not available for that purpose.
</para>
</listitem>
@@ -3948,7 +3948,7 @@
<para>
The default interval is 1500 milliseconds (1.5 seconds).
- This interval can vary between indidivual data nodes
+ This interval can vary between individual data nodes
because each storage node watches the MySQL servers
connected to it, independently of all other data nodes.
</para>
@@ -4396,7 +4396,7 @@
<para>
By default, only the startup message is sent to
- <literal>stdout</literal>, with the reaimaining event
+ <literal>stdout</literal>, with the remaining event
reporting level defaults being set to 0. The reason for this
is that these messages are also sent to the management
server's cluster log.
@@ -5972,7 +5972,7 @@
Instructs <command>ndbd</command> not to start
automatically. When this option is used,
<command>ndbd</command> connects to the management server,
- obtains configuration data from it, and initialises
+ obtains configuration data from it, and initializes
communication objects. However, it will not actually start
the execution engine until specifically requested to do so
by the management server. This can be accomplished by
@@ -6166,7 +6166,7 @@
<para>
<emphasis role="bold">Initial Node Restart</emphasis>:
This is the same as a node restart, except that the node
- is reinitialised and started with a clean filesystem.
+ is reinitialized and started with a clean filesystem.
</para>
</listitem>
@@ -6175,7 +6175,7 @@
<para>
Prior to startup, each data node (<literal>ndbd</literal>
- process) must be initialised. This consists of the following:
+ process) must be initialized. This consists of the following:
<orderedlist>
@@ -6200,7 +6200,7 @@
<listitem>
<para>
Allocate memory according to settings obtained from the
- cofiguration file.
+ configuration file.
</para>
</listitem>
@@ -6208,7 +6208,7 @@
</para>
<para>
- Once each data node has been initialised, the cluster startup
+ Once each data node has been initialized, the cluster startup
process can proceed. The stages which the cluster goes through
during this process are listed here:
@@ -6258,7 +6258,7 @@
</para>
<para>
- This stage consists of the initialisation of a number of
+ This stage consists of the initialization of a number of
internal cluster variables.
</para>
</listitem>
@@ -6332,13 +6332,13 @@
<listitem>
<para>
The node's schema is compared with the
- master' and synchronised with it.
+ master' and synchronized with it.
</para>
</listitem>
<listitem>
<para>
- Synchronise data received in the form of
+ Synchronize data received in the form of
<literal>INSERT</literal> from the other data nodes
in this node's node group.
</para>
@@ -6942,7 +6942,7 @@
</para>
<para>
- The logging messages shown below are assocated with
+ The logging messages shown below are associated with
checkpoints.
</para>
@@ -8447,7 +8447,7 @@
determining whether or not SCI is enabled should be fairly
simple from observing the latency.
(<emphasis role="bold">Note</emphasis>: Before using
- <command>latency_bench</command>, it is necessaryto set the
+ <command>latency_bench</command>, it is necessary to set the
<literal>LD_PRELOAD</literal> environment variable as shown
later in this section.)
</para>
@@ -8833,7 +8833,7 @@
<para>
Database memory size and index memory size
(<literal>DataMemory</literal> and
- <literal>IndexMemory</literal>, repectively).
+ <literal>IndexMemory</literal>, respectively).
</para>
</listitem>
@@ -9662,7 +9662,7 @@
systems. We have had reports from users who say that they have
run Cluster successfully on FreeBSD. However, Cluster on any
but the three platforms mentioned here should be considered
- alpha software (at best), cannot be guaranteed relaiable in a
+ alpha software (at best), cannot be guaranteed reliable in a
production setting, and <emphasis>is not supported by MySQL
AB</emphasis>.
</para>
@@ -9682,7 +9682,7 @@
Cluster should run on any platform for which NDB-enabled
binaries are available. Naturally, faster CPUs and more memory
will improve performance, and 64-bit CPUs will likely be more
- effective than 32-bit processors. There must be sufficent
+ effective than 32-bit processors. There must be sufficient
memory on machines used for data nodes to hold each node's
share of the database (see <emphasis role="bold">How much RAM
do I Need?</emphasis> for more info). Nodes can communicate
@@ -9967,7 +9967,7 @@
unique indexes will generally cause table updates to run
more quickly. This is due to the fact that less memory is
required (since no ordered indexes are created), and that
- less CPU must be utilised (since fewer indexes must be
+ less CPU must be utilized (since fewer indexes must be
read and possibly updated).
</para>
</listitem>
@@ -10301,7 +10301,7 @@
All cluster nodes recognise the same node as the arbitrator,
which is normally the management server; however, it is
possible to configure any of the MySQL Servers in the cluster
- to act as the arbirtrator instead. The arbitrator accepts the
+ to act as the arbitrator instead. The arbitrator accepts the
first set of cluster nodes to contact it, and tells the
remaining set to shut down. Arbitrator selection is controlled
by the <literal>ArbitrationRank</literal> configuration
@@ -10309,7 +10309,7 @@
<xref linkend="mysql-cluster-mgm-definition"/> for details.)
It should also be noted that the role of arbitrator does not
in and of itself impose any heavy demands upon the host so
- designated, and thus the artitrator host does not need to be
+ designated, and thus the arbitrator host does not need to be
particularly fast or to have extra memory especially for this
purpose.
</para>
@@ -10632,7 +10632,7 @@
<para>
A GCP occurs every few seconds, when transactions for all
- nodes are synchronised and the redo-log is flushed to
+ nodes are synchronized and the redo-log is flushed to
disk.
</para>
</listitem>
@@ -10815,7 +10815,7 @@
</para>
<para>
- The process of restarting the cluster and reinitialising its
+ The process of restarting the cluster and reinitializing its
state from disk logs and checkpoints. This is required after
either a planned or an unplanned shutdown of the cluster.
</para>
@@ -11119,7 +11119,7 @@
<para>
Under normal circumstances, it is necessary and sufficient to
keep and examine only the cluster log. The node logs need be
- comsulted only for application development and debugging
+ consulted only for application development and debugging
purposes.
</para>
</listitem>
Modified: trunk/refman-5.0/precision-math.xml
===================================================================
--- trunk/refman-5.0/precision-math.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/precision-math.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -540,7 +540,7 @@
</itemizedlist>
<para>
- If a numeric expresssion contains any strings, they are converted
+ If a numeric expression contains any strings, they are converted
to double-precision floating-point values and the expression is
approximate.
</para>
Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/problems.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -516,7 +516,7 @@
ports to the user. After any port is closed it will remain in
a <literal>TIME_WAIT</literal> status for 120 seconds. This
status allows the connection to be reused at a much lower cost
- than re-initialising a brand new connection. However, the port
+ than reinitializing a brand new connection. However, the port
will not be available again until this time expires.
</para>
@@ -3412,7 +3412,7 @@
<literal>=</literal>, <literal>>=</literal>,
<literal>></literal>, or <literal>BETWEEN</literal>
operators, MySQL normally converts the string to an internal
- long integer for faster comparision (and also for a bit more
+ long integer for faster comparison (and also for a bit more
<quote>relaxed</quote> string checking). However, this
conversion is subject to the following exceptions:
</para>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/replication.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -930,7 +930,7 @@
can use to connect. This account must be given the
<literal>REPLICATION SLAVE</literal> privilege. If the account
is used only for replication (which is recommended), you don't
- need to grant any additional privileges. (For informaiton
+ need to grant any additional privileges. (For information
about setting up user accounts and privileges, see
<xref linkend="user-account-management"/>.)
</para>
Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/restrictions.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -143,7 +143,7 @@
<emphasis role="bold">Note</emphasis>: Before MySQL 5.0.10,
stored functions created with <literal>CREATE
FUNCTION</literal> must not contain references to tables, with
- limited execeptions. They may include some
+ limited exceptions. They may include some
<literal>SET</literal> statements that contain table
references, for example <literal>SET a:= (SELECT MAX(id) FROM
t)</literal>, and <literal>SELECT</literal> statements that
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/sql-syntax.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -7623,7 +7623,7 @@
for <literal>SELECT *</literal> expansion, the two
joins are not semantically identical. The
<literal>USING</literal> join selects the coalesced
- value of correspondinging columns, whereas the
+ value of corresponding columns, whereas the
<literal>ON</literal> join selects all columns from
all tables. For the preceding <literal>USING</literal>
join, <literal>SELECT *</literal> selects these
@@ -10873,7 +10873,7 @@
The <replaceable>gtrid</replaceable> and
<replaceable>bqual</replaceable> values are interpreted in
bytes by the MySQL server's underlying XA support routines.
- However, while a SQL statement containing an XA statement is
+ However, while an SQL statement containing an XA statement is
being parsed, the server works with some specific character
set. To be safe, write <replaceable>gtrid</replaceable> and
<replaceable>bqual</replaceable> as hex strings.
@@ -12262,7 +12262,7 @@
<para>
<literal>REQUIRE CIPHER
'<replaceable>cipher</replaceable>'</literal> is needed to
- ensure thatciphers and key lengths of sufficient strength
+ ensure that ciphers and key lengths of sufficient strength
are used. SSL itself can be weak if old algorithms using
short encryption keys are used. Using this option, you can
ask that a specific cipher method is used to allow a
Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.0/stored-procedures.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -529,7 +529,7 @@
<para>
<emphasis role="bold">Note</emphasis>: Before MySQL 5.0.10,
stored functions created with <literal>CREATE FUNCTION</literal>
- must not contain references to tables, with limited execeptions.
+ must not contain references to tables, with limited exceptions.
They may include some <literal>SET</literal> statements that
contain table references, for example <literal>SET a:= (SELECT
MAX(id) FROM t)</literal>, and <literal>SELECT</literal>
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/apis.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -4086,7 +4086,7 @@
<para>
This function is used to create a legal SQL string that you
- can use in a SQL statement. See
+ can use in an SQL statement. See
<xref linkend="string-syntax"/>.
</para>
@@ -6378,7 +6378,7 @@
<para>
This function is used to create a legal SQL string that you
- can use in a SQL statement. See
+ can use in an SQL statement. See
<xref linkend="string-syntax"/>.
</para>
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/charset.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -3581,7 +3581,7 @@
However, the meaning of <quote>SHIFT JIS</quote> as a
descriptive term has become very vague and it often includes
the extensions to <literal>Shift_JIS</literal> that are
- defined by various venders.
+ defined by various vendors.
</para>
<para>
Modified: trunk/refman-5.1/client-side-scripts.xml
===================================================================
--- trunk/refman-5.1/client-side-scripts.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/client-side-scripts.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -2268,7 +2268,7 @@
prompt (\R) Change your mysql prompt.
quit (\q) Quit mysql.
rehash (\#) Rebuild completion hash.
-source (\.) Execute a SQL script file. Takes a file name as an argument.
+source (\.) Execute an SQL script file. Takes a file name as an argument.
status (\s) Get status information from the server.
system (\!) Execute a system shell command.
tee (\T) Set outfile [to_outfile]. Append everything into given outfile.
Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/connector-j.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1227,7 +1227,7 @@
behavior can be modified using the '
<property>zeroDateTimeBehavior</property> ' configuration
property. The allowable values are: 'exception' (the
- default), which throws a SQLException with a SQLState of
+ default), which throws an SQLException with an SQLState of
'S1009', 'convertToNull', which returns NULL instead of
the date, and 'round', which rounds the date to the
nearest closest value which is '0001-01-01'.
@@ -4280,7 +4280,7 @@
<question>
<para>
- My application throws a SQLException 'No Suitable Driver'.
+ My application throws an SQLException 'No Suitable Driver'.
Why is this happening?
</para>
Modified: trunk/refman-5.1/connector-mxj.xml
===================================================================
--- trunk/refman-5.1/connector-mxj.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/connector-mxj.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -458,7 +458,7 @@
The MysqldResource will allow you to "start" MySQL with a
java.util.Map of server options which you provide, as well as
"shutdown" the database. The following example shows a simplistic
- way to embed MySQL in an applicaiton using plain java objects:
+ way to embed MySQL in an application using plain java objects:
</para>
<programlisting>
Modified: trunk/refman-5.1/connector-net.xml
===================================================================
--- trunk/refman-5.1/connector-net.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/connector-net.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -223,7 +223,7 @@
<listitem>
<para>
- <literal>MySqlCommand</literal>: Represents a SQL statement to
+ <literal>MySqlCommand</literal>: Represents an SQL statement to
execute against a MySQL database.
</para>
</listitem>
@@ -274,7 +274,7 @@
<listitem>
<para>
- <literal>MySqlTransaction</literal>: Represents a SQL
+ <literal>MySqlTransaction</literal>: Represents an SQL
transaction to be made in a MySQL database.
</para>
</listitem>
@@ -295,7 +295,7 @@
<title>The MySqlCommand Class</title>
<para>
- The <literal>MySqlCommand</literal> class represents a SQL
+ The <literal>MySqlCommand</literal> class represents an SQL
statement to execute against a MySQL database.
</para>
@@ -431,7 +431,7 @@
<listitem>
<para>
- <literal>ExecuteNonQuery</literal>: Executes a SQL
+ <literal>ExecuteNonQuery</literal>: Executes an SQL
statement against the connection and returns the number of
rows affected.
</para>
@@ -476,7 +476,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-command-usage-vbnet">
@@ -705,7 +705,7 @@
The following example uses the MySqlCommand, along
MySqlDataAdapter and MySqlConnection, to select rows from a
data source. The example is passed an initialized DataSet, a
- connection string, a query string that is a SQL SELECT
+ connection string, a query string that is an SQL SELECT
statement, and a string that is the name of the database
table. The example then creates a MySqlCommandBuilder.
</para>
@@ -957,7 +957,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-connection-usage-vb">
@@ -1095,7 +1095,7 @@
<listitem>
<para>
- <literal>DeleteCommand</literal>: Gets or sets a SQL
+ <literal>DeleteCommand</literal>: Gets or sets an SQL
statement or stored procedure used to delete records from
the data set.
</para>
@@ -1103,7 +1103,7 @@
<listitem>
<para>
- <literal>InsertCommand</literal>: Gets or sets a SQL
+ <literal>InsertCommand</literal>: Gets or sets an SQL
statement or stored procedure used to insert records into
the data set.
</para>
@@ -1127,7 +1127,7 @@
<listitem>
<para>
- <literal>SelectCommand</literal>: Gets or sets a SQL
+ <literal>SelectCommand</literal>: Gets or sets an SQL
statement or stored procedure used to select records in
the data source.
</para>
@@ -1143,7 +1143,7 @@
<listitem>
<para>
- <literal>UpdateCommand</literal>: Gets or sets a SQL
+ <literal>UpdateCommand</literal>: Gets or sets an SQL
statement or stored procedure used to updated records in
the data source.
</para>
@@ -1213,7 +1213,7 @@
Connection for the MySqlCommand. The example then calls
ExecuteNonQuery, and closes the connection. To accomplish
this, the ExecuteNonQuery is passed a connection string and a
- query string that is a SQL INSERT statement.
+ query string that is an SQL INSERT statement.
</para>
<section id="connector-net-architecture-adapter-usage-vb">
@@ -1960,7 +1960,7 @@
<title>The MySqlTransaction Class</title>
<para>
- Represents a SQL transaction to be made in a MySQL database.
+ Represents an SQL transaction to be made in a MySQL database.
</para>
<section id="connector-net-architecture-transaction-properties">
Modified: trunk/refman-5.1/custom-engine.xml
===================================================================
--- trunk/refman-5.1/custom-engine.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/custom-engine.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -5083,7 +5083,7 @@
<para>
Used both for cases of truncation and for cases where the
optimizer realizes that all rows will be removed as a result of
- a SQL statement.
+ an SQL statement.
</para>
<para>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/data-types.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1153,7 +1153,7 @@
<listitem>
<para>
Character column sorting and comparison are based on the
- character set assigned to the column. For earalier versions,
+ character set assigned to the column. For earlier versions,
sorting and comparison are based on the collation of the
server character set. For <literal>CHAR</literal> and
<literal>VARCHAR</literal> columns, you can declare the
@@ -2785,7 +2785,7 @@
created with <literal>MAXDB</literal> mode enabled. (As noted
above, <literal>MAXDB</literal> mode causes columns to be
created as <literal>DATETIME</literal> columns.) The rules
- governing initialisation and updating of
+ governing initialization and updating of
<literal>TIMESTAMP</literal> columns are as follows:
</para>
@@ -3128,7 +3128,7 @@
<literal>TIME</literal> column. Without colons, MySQL interprets
values using the assumption that the two rightmost digits
represent seconds. (MySQL interprets <literal>TIME</literal>
- valuesas elapsed time rather than as time of day.) For example,
+ values as elapsed time rather than as time of day.) For example,
you might think of <literal>'1112'</literal> and
<literal>1112</literal> as meaning <literal>'11:12:00'</literal>
(12 minutes after 11 o'clock), but MySQL interprets them as
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/database-administration.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -8426,11 +8426,11 @@
log. Note that there is one write to the binary log per
statement if in autocommit mode, and otherwise one write
per transaction. The default value is 0 which does no
- synchronising to disk. A value of 1 is the safest choice,
+ synchronizing to disk. A value of 1 is the safest choice,
because in the event of a crash you lose at most one
statement/transaction from the binary log; however, it is
also the slowest choice (unless the disk has a
- battery-backed cache, which makes synchronisation very
+ battery-backed cache, which makes synchronization very
fast).
</para>
</listitem>
@@ -8443,7 +8443,7 @@
<para>
If this variable is set to 1, then when a non-temporary
table is created its <filename>.frm</filename> file is
- synchronised to disk (<literal>fdatasync()</literal>);
+ synchronized to disk (<literal>fdatasync()</literal>);
this is slower but safer in case of a crash. The default
is 1.
</para>
@@ -16246,7 +16246,7 @@
<para>
MySQL usernames can be up to a maximum of 16 characters
long. This limit is hard-coded in the MySQL servers and
- clients, and trying to cirumvent it by modifying the
+ clients, and trying to circumvent it by modifying the
definitions of the tables in the <literal>mysql</literal>
database <emphasis>does not work</emphasis>.
</para>
@@ -19003,7 +19003,7 @@
<para>
To be able to restore data from a binary log, you will need to
know the path and name of the current binary log file. The path
- can tyically be found in the options file (that is,
+ can typically be found in the options file (that is,
<filename>my.cnf</filename> or <filename>my.ini</filename>,
depending on your system). If it's not contained in the options
file, it may be given as an option at the command-line when the
Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/extending-mysql.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -232,7 +232,7 @@
A test case consists of <literal>;</literal> terminated
statements and is similar to the input of
<command>mysql</command> command-line client. A statement
- by default is a SQL statment to be sent to MySQL server,
+ by default is an SQL statement to be sent to MySQL server,
unless it is recognized as internal command (for example,
<command>sleep</command>).
</para>
@@ -1241,7 +1241,7 @@
The <literal>init</literal> and <literal>deinit</literal>
functions in the general plugin declaration are invoked only
when loading and unloading the plugin. They have nothing to do
- with use of the plugin such as happens when a SQL statement
+ with use of the plugin such as happens when an SQL statement
causes the plugin to be invoked.
</para>
@@ -2394,7 +2394,7 @@
<para>
The MySQL interface for user-defined functions provides the
- following features and capabilties:
+ following features and capabilities:
</para>
<itemizedlist>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/installing.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -556,7 +556,7 @@
<para>
MySQL &next-series; is the next development release series
and is the series in which new features are to be
- implemented. Alpha releases will be made avilable in the
+ implemented. Alpha releases will be made available in the
near future to allow widespread testing by interested
users.
</para>
@@ -4611,7 +4611,7 @@
</remark>
<para>
- The informaiton in this section applies primarily if you
+ The information in this section applies primarily if you
installed MySQL using the <literal>Noinstall</literal> version,
or if you wish to configure and test MySQL manually rather than
with the GUI tools.
@@ -13671,7 +13671,7 @@
</para>
<para>
- In the MySQL benchmarks, we obtained a 4% speed incrase on
+ In the MySQL benchmarks, we obtained a 4% speed increase on
UltraSPARC when using Forte 5.0 in 32-bit mode, as compared to
using <command>gcc</command> 3.2 with the <option>-mcpu</option>
flag.
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/ndbcluster.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -260,7 +260,7 @@
Configuration of a cluster involves configuring each individual
node in the cluster and setting up individual communication links
between nodes. MySQL Cluster is currently designed with the
- intention that storage nodes are homogenous in terms of processor
+ intention that storage nodes are homogeneous in terms of processor
power, memory space, and bandwidth. In addition, in order to
provide a single point of configuration, all configuration data
for the cluster as a whole is located in one configuration file.
@@ -474,7 +474,7 @@
Standard 100 Mbps or 1 gigabit Ethernet cards are installed on
each machine, along with the proper drivers for the cards, and
that all 4 hosts are connected via a standard-issue Ethernet
- networking applicance such as a switch. (All machines should
+ networking appliance such as a switch. (All machines should
use network cards with the same throughout; that is, all 4
machines in the cluster should have 100 Mbps cards
<emphasis>or</emphasis> all 4 machines should have 1 Gbps
@@ -2490,7 +2490,7 @@
<listitem>
<para>
<literal>2</literal>: Indicates a low-priority node
- which be used as an arbtrator only if a node with a
+ which be used as an arbitrator only if a node with a
higher priority is not available for that purpose.
</para>
</listitem>
@@ -3948,7 +3948,7 @@
<para>
The default interval is 1500 milliseconds (1.5 seconds).
- This interval can vary between indidivual data nodes
+ This interval can vary between individual data nodes
because each storage node watches the MySQL servers
connected to it, independently of all other data nodes.
</para>
@@ -4396,7 +4396,7 @@
<para>
By default, only the startup message is sent to
- <literal>stdout</literal>, with the reaimaining event
+ <literal>stdout</literal>, with the remaining event
reporting level defaults being set to 0. The reason for this
is that these messages are also sent to the management
server's cluster log.
@@ -5972,7 +5972,7 @@
Instructs <command>ndbd</command> not to start
automatically. When this option is used,
<command>ndbd</command> connects to the management server,
- obtains configuration data from it, and initialises
+ obtains configuration data from it, and initializes
communication objects. However, it will not actually start
the execution engine until specifically requested to do so
by the management server. This can be accomplished by
@@ -6166,7 +6166,7 @@
<para>
<emphasis role="bold">Initial Node Restart</emphasis>:
This is the same as a node restart, except that the node
- is reinitialised and started with a clean filesystem.
+ is reinitialized and started with a clean filesystem.
</para>
</listitem>
@@ -6175,7 +6175,7 @@
<para>
Prior to startup, each data node (<literal>ndbd</literal>
- process) must be initialised. This consists of the following:
+ process) must be initialized. This consists of the following:
<orderedlist>
@@ -6200,7 +6200,7 @@
<listitem>
<para>
Allocate memory according to settings obtained from the
- cofiguration file.
+ configuration file.
</para>
</listitem>
@@ -6208,7 +6208,7 @@
</para>
<para>
- Once each data node has been initialised, the cluster startup
+ Once each data node has been initialized, the cluster startup
process can proceed. The stages which the cluster goes through
during this process are listed here:
@@ -6258,7 +6258,7 @@
</para>
<para>
- This stage consists of the initialisation of a number of
+ This stage consists of the initialization of a number of
internal cluster variables.
</para>
</listitem>
@@ -6332,13 +6332,13 @@
<listitem>
<para>
The node's schema is compared with the
- master' and synchronised with it.
+ master' and synchronized with it.
</para>
</listitem>
<listitem>
<para>
- Synchronise data received in the form of
+ Synchronize data received in the form of
<literal>INSERT</literal> from the other data nodes
in this node's node group.
</para>
@@ -6942,7 +6942,7 @@
</para>
<para>
- The logging messages shown below are assocated with
+ The logging messages shown below are associated with
checkpoints.
</para>
@@ -10061,7 +10061,7 @@
determining whether or not SCI is enabled should be fairly
simple from observing the latency.
(<emphasis role="bold">Note</emphasis>: Before using
- <command>latency_bench</command>, it is necessaryto set the
+ <command>latency_bench</command>, it is necessary to set the
<literal>LD_PRELOAD</literal> environment variable as shown
later in this section.)
</para>
@@ -10445,7 +10445,7 @@
<para>
Database memory size and index memory size
(<literal>DataMemory</literal> and
- <literal>IndexMemory</literal>, repectively).
+ <literal>IndexMemory</literal>, respectively).
</para>
</listitem>
@@ -11243,7 +11243,7 @@
systems. We have had reports from users who say that they have
run Cluster successfully on FreeBSD. However, Cluster on any
but the three platforms mentioned here should be considered
- alpha software (at best), cannot be guaranteed relaiable in a
+ alpha software (at best), cannot be guaranteed reliable in a
production setting, and <emphasis>is not supported by MySQL
AB</emphasis>.
</para>
@@ -11263,7 +11263,7 @@
Cluster should run on any platform for which NDB-enabled
binaries are available. Naturally, faster CPUs and more memory
will improve performance, and 64-bit CPUs will likely be more
- effective than 32-bit processors. There must be sufficent
+ effective than 32-bit processors. There must be sufficient
memory on machines used for data nodes to hold each node's
share of the database (see <emphasis role="bold">How much RAM
do I Need?</emphasis> for more info). Nodes can communicate
@@ -11548,7 +11548,7 @@
unique indexes will generally cause table updates to run
more quickly. This is due to the fact that less memory is
required (since no ordered indexes are created), and that
- less CPU must be utilised (since fewer indexes must be
+ less CPU must be utilized (since fewer indexes must be
read and possibly updated).
</para>
</listitem>
@@ -11882,7 +11882,7 @@
All cluster nodes recognise the same node as the arbitrator,
which is normally the management server; however, it is
possible to configure any of the MySQL Servers in the cluster
- to act as the arbirtrator instead. The arbitrator accepts the
+ to act as the arbitrator instead. The arbitrator accepts the
first set of cluster nodes to contact it, and tells the
remaining set to shut down. Arbitrator selection is controlled
by the <literal>ArbitrationRank</literal> configuration
@@ -11890,7 +11890,7 @@
<xref linkend="mysql-cluster-mgm-definition"/> for details.)
It should also be noted that the role of arbitrator does not
in and of itself impose any heavy demands upon the host so
- designated, and thus the artitrator host does not need to be
+ designated, and thus the arbitrator host does not need to be
particularly fast or to have extra memory especially for this
purpose.
</para>
@@ -12213,7 +12213,7 @@
<para>
A GCP occurs every few seconds, when transactions for all
- nodes are synchronised and the redo-log is flushed to
+ nodes are synchronized and the redo-log is flushed to
disk.
</para>
</listitem>
@@ -12396,7 +12396,7 @@
</para>
<para>
- The process of restarting the cluster and reinitialising its
+ The process of restarting the cluster and reinitializing its
state from disk logs and checkpoints. This is required after
either a planned or an unplanned shutdown of the cluster.
</para>
@@ -12700,7 +12700,7 @@
<para>
Under normal circumstances, it is necessary and sufficient to
keep and examine only the cluster log. The node logs need be
- comsulted only for application development and debugging
+ consulted only for application development and debugging
purposes.
</para>
</listitem>
Modified: trunk/refman-5.1/precision-math.xml
===================================================================
--- trunk/refman-5.1/precision-math.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/precision-math.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -473,7 +473,7 @@
</itemizedlist>
<para>
- If a numeric expresssion contains any strings, they are converted
+ If a numeric expression contains any strings, they are converted
to double-precision floating-point values and the expression is
approximate.
</para>
Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/problems.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -516,7 +516,7 @@
ports to the user. After any port is closed it will remain in
a <literal>TIME_WAIT</literal> status for 120 seconds. This
status allows the connection to be reused at a much lower cost
- than re-initialising a brand new connection. However, the port
+ than reinitializing a brand new connection. However, the port
will not be available again until this time expires.
</para>
@@ -3412,7 +3412,7 @@
<literal>=</literal>, <literal>>=</literal>,
<literal>></literal>, or <literal>BETWEEN</literal>
operators, MySQL normally converts the string to an internal
- long integer for faster comparision (and also for a bit more
+ long integer for faster comparison (and also for a bit more
<quote>relaxed</quote> string checking). However, this
conversion is subject to the following exceptions:
</para>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/replication.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1084,7 +1084,7 @@
can use to connect. This account must be given the
<literal>REPLICATION SLAVE</literal> privilege. If the account
is used only for replication (which is recommended), you don't
- need to grant any additional privileges. (For informaiton
+ need to grant any additional privileges. (For information
about setting up user accounts and privileges, see
<xref linkend="user-account-management"/>.)
</para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-5.1/sql-syntax.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -8178,7 +8178,7 @@
for <literal>SELECT *</literal> expansion, the two
joins are not semantically identical. The
<literal>USING</literal> join selects the coalesced
- value of correspondinging columns, whereas the
+ value of corresponding columns, whereas the
<literal>ON</literal> join selects all columns from
all tables. For the preceding <literal>USING</literal>
join, <literal>SELECT *</literal> selects these
@@ -11410,7 +11410,7 @@
The <replaceable>gtrid</replaceable> and
<replaceable>bqual</replaceable> values are interpreted in
bytes by the MySQL server's underlying XA support routines.
- However, while a SQL statement containing an XA statement is
+ However, while an SQL statement containing an XA statement is
being parsed, the server works with some specific character
set. To be safe, write <replaceable>gtrid</replaceable> and
<replaceable>bqual</replaceable> as hex strings.
@@ -12744,7 +12744,7 @@
<para>
<literal>REQUIRE CIPHER
'<replaceable>cipher</replaceable>'</literal> is needed to
- ensure thatciphers and key lengths of sufficient strength
+ ensure that ciphers and key lengths of sufficient strength
are used. SSL itself can be weak if old algorithms using
short encryption keys are used. Using this option, you can
ask that a specific cipher method is used to allow a
Modified: trunk/refman-common/credits.xml
===================================================================
--- trunk/refman-common/credits.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-common/credits.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1654,7 +1654,7 @@
people so too many to mention here. Notable name is Ataullah
Dabaghi who up until 1999 contributed around a third of the
code base. A special thanks also to developers of the AXE
- system which provided much of the architecturial foundations
+ system which provided much of the architectural foundations
for NDB Cluster with blocks, signals and crash tracing
functionality. Also credit should be given to those who
believed in the ideas enough to allocate of their budgets for
Modified: trunk/refman-common/news-4.1.xml
===================================================================
--- trunk/refman-common/news-4.1.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-common/news-4.1.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -3985,7 +3985,7 @@
<listitem>
<para>
Fixed server crash when left expression of
- <literal>IN/ALL/ANY</literal> comparision was a subquery. (Bug
+ <literal>IN/ALL/ANY</literal> comparison was a subquery. (Bug
#8888)
</para>
</listitem>
Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-common/news-5.0.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -1456,7 +1456,7 @@
<para>
On Windows, the value of <literal>character_sets_dir</literal>
in <literal>SHOW VARIABLES</literal> output was displayed
- inconsistenly (using both ‘<literal>/</literal>’
+ inconsistently (using both ‘<literal>/</literal>’
and ‘<literal>\</literal>’ as pathname component
separators). (Bug #14137)
</para>
@@ -2743,7 +2743,7 @@
<listitem>
<para>
<literal>NDBCluster</literal>: The average row size for
- Cluster tables was being calcualted incorrectly. This affected
+ Cluster tables was being calculated incorrectly. This affected
the values shown for the <literal>Data_length</literal> and
<literal>Avg_row_length</literal> columns in the output
generated by <literal>SHOW TABLE STATUS</literal> as well as
@@ -4578,7 +4578,7 @@
<listitem>
<para>
Unsigned <literal>LONG</literal> system variables may return
- incorrect value when retreived with a
+ incorrect value when retrieved with a
<literal>SELECT</literal> for certain values. (Bug #10351)
</para>
</listitem>
@@ -6354,7 +6354,7 @@
<listitem>
<para>
- All characters occuring on the same line following the
+ All characters occurring on the same line following the
<literal>DELIMITER</literal> keyword will be set as delimiter.
For example, <literal>DELIMITER :;</literal> will set
<literal>:;</literal> as the delimiter. This behavior is now
@@ -9897,7 +9897,7 @@
<listitem>
<para>
- Fixed a bug that caused server crash if some error occured
+ Fixed a bug that caused server crash if some error occurred
during filling of temporary table created for derived table or
view handling. (Bug #7413)
</para>
Modified: trunk/refman-common/news-cluster.xml
===================================================================
--- trunk/refman-common/news-cluster.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-common/news-cluster.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -226,7 +226,7 @@
<listitem>
<para>
(Bug #8315) NdbScanFilter cmp method only works for strings of
- exact word boundry length
+ exact word boundary length
</para>
</listitem>
@@ -536,8 +536,8 @@
<listitem>
<para>
- (Bug #10471) Backup can become inconsisten wi/ certain
- combinations of multi updates
+ (Bug #10471) Backup can become inconsistent with certain
+ combinations of multiple-row updates
</para>
</listitem>
@@ -573,7 +573,7 @@
<listitem>
<para>
- (Bug #9960) START BACKUP reports failure albeit succeding
+ (Bug #9960) START BACKUP reports failure albeit succeeding
</para>
</listitem>
@@ -1086,7 +1086,7 @@
Clear text ndb error messages provided also for error codes
that are mapped to corresponding mysql error codes, by
executing <literal>SHOW WARNINGS</literal> after an error has
- occured which relates to the ndb storage engine.
+ occurred which relates to the ndb storage engine.
</para>
</listitem>
@@ -1223,7 +1223,7 @@
<listitem>
<para>
(Bug #6684) ndb_restore doesn't give error messages if
- inproper command given
+ improper command given
</para>
</listitem>
@@ -1577,7 +1577,7 @@
<listitem>
<para>
Clear text ndb error messages provided by executing
- <literal>SHOW WARNINGS</literal> after an error has occured
+ <literal>SHOW WARNINGS</literal> after an error has occurred
which relates to the ndb storage engine.
</para>
</listitem>
Modified: trunk/refman-common/news-connector-j.xml
===================================================================
--- trunk/refman-common/news-connector-j.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-common/news-connector-j.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -906,14 +906,14 @@
you must set the 'allowUrlInLocalInfile' connection property to 'true'.
- The driver is more strict about truncation of numerics on
- ResultSet.get*(), and will throw a SQLException when truncation is
+ ResultSet.get*(), and will throw an SQLException when truncation is
detected. You can disable this by setting 'jdbcCompliantTruncation' to
false (it is enabled by default, as this functionality is required
for JDBC compliance).
- Added three ways to deal with all-zero datetimes when reading them from
- a ResultSet, 'exception' (the default), which throws a SQLException
- with a SQLState of 'S1009', 'convertToNull', which returns NULL instead of
+ a ResultSet, 'exception' (the default), which throws an SQLException
+ with an SQLState of 'S1009', 'convertToNull', which returns NULL instead of
the date, and 'round', which rounds the date to the nearest closest value
which is '0001-01-01'.
@@ -1351,7 +1351,7 @@
- Fixed BUG#5069 -- ResultSet.getMetaData() should not return
incorrectly-initialized metadata if the result set has been closed, but
- should instead throw a SQLException. Also fixed for getRow() and
+ should instead throw an SQLException. Also fixed for getRow() and
getWarnings() and traversal methods by calling checkClosed() before
operating on instance-level fields that are nullified during .close().
Modified: trunk/refman-common/news-connector-net.xml
===================================================================
--- trunk/refman-common/news-connector-net.xml 2005-12-20 15:55:16 UTC (rev 602)
+++ trunk/refman-common/news-connector-net.xml 2005-12-20 18:52:00 UTC (rev 603)
@@ -2381,7 +2381,7 @@
<listitem>
<para>
- Fixed sequence problem in driver that occured after thrown
+ Fixed sequence problem in driver that occurred after thrown
exception (thanks Burkhard Perkens-Golomb)
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r603 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 20 Dec |
