Author: paul
Date: 2006-01-26 05:14:45 +0100 (Thu, 26 Jan 2006)
New Revision: 1042
Log:
r6690@frost: paul | 2006-01-25 22:10:24 -0600
Cleanup revisions.
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/functions.xml
trunk/refman-4.1/ndbcluster.xml
trunk/refman-4.1/porting.xml
trunk/refman-4.1/problems.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/apis.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.0/porting.xml
trunk/refman-5.0/problems.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/custom-engine.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/functions.xml
trunk/refman-5.1/ndbcluster.xml
trunk/refman-5.1/partitioning.xml
trunk/refman-5.1/porting.xml
trunk/refman-5.1/problems.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6689
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2535
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6690
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2535
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-4.1/apis.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1541,7 +1541,7 @@
<row>
<entry><emphasis role="bold">mysql_real_escape_string()</emphasis></entry>
<entry>Escapes special characters in a string for use in an SQL statement,
- taking into account the current charset of the
+ taking into account the current character set of the
connection.</entry>
</row>
<row>
@@ -1993,7 +1993,7 @@
<para>
Note that when you use a <literal>REPLACE</literal> command,
<literal>mysql_affected_rows()</literal> returns 2 if the new
- row replaced an old row, because in this case one row was
+ row replaced an old row, because in this case, one row was
inserted after the duplicate was deleted.
</para>
@@ -2082,7 +2082,7 @@
<para>
<literal>mysql_change_user()</literal> fails if the connected
user cannot be authenticated or doesn't have permission to use
- the database. In this case the user and database are not
+ the database. In this case, the user and database are not
changed
</para>
@@ -2390,7 +2390,7 @@
corresponding parameters for
<literal>mysql_real_connect()</literal> with the difference
that the connection parameter may be <literal>NULL</literal>.
- In this case the C API allocates memory for the connection
+ In this case, the C API allocates memory for the connection
structure automatically and frees it when you call
<literal>mysql_close()</literal>. The disadvantage of this
approach is that you can't retrieve an error message if the
@@ -3093,8 +3093,8 @@
connection handler as its first argument and escapes the
string according to the current character set.
<literal>mysql_escape_string()</literal> does not take a
- connection argument and does not respect the current charset
- setting.
+ connection argument and does not respect the current character
+ set.
</para>
</section>
@@ -12740,11 +12740,11 @@
4.0.6, MySQL blocks <literal>SIGPIPE</literal> on the first call
to <literal>mysql_server_init</literal>(),
<literal>mysql_init()</literal>, or
- <literal>mysql_connect()</literal>. This is done in order to
- avoid aborting the program when a connection terminates. If you
- want to use your own <literal>SIGPIPE</literal> handler, you
- should first call <literal>mysql_server_init()</literal> and
- then install your handler.
+ <literal>mysql_connect()</literal>. This is done to avoid
+ aborting the program when a connection terminates. If you want
+ to use your own <literal>SIGPIPE</literal> handler, you should
+ first call <literal>mysql_server_init()</literal> and then
+ install your handler.
</para>
<remark role="todo">
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-4.1/client-utility-programs.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -8907,7 +8907,7 @@
‘<literal>_</literal>’ wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a ‘<literal>_</literal>’ in the
- name, because in this case <command>mysqlshow</command> shows
+ name, because in this case, <command>mysqlshow</command> shows
you only the table names that match the pattern. This is
easily fixed by adding an extra
‘<literal>%</literal>’ last on the command line as
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-4.1/database-administration.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -597,9 +597,9 @@
</para>
<para>
- Use <replaceable>collation_name</replaceable> as the default
- server collation. This option is available as of MySQL
- 4.1.3. See <xref linkend="character-sets"/>.
+ Use <replaceable>collation_name</replaceable> as the
+ default server collation. This option is available as of
+ MySQL 4.1.3. See <xref linkend="character-sets"/>.
</para>
</listitem>
@@ -681,8 +681,8 @@
</para>
<para>
- Use <replaceable>collation_name</replaceable> as the default
- collation. This option is deprecated in favor of
+ Use <replaceable>collation_name</replaceable> as the
+ default collation. This option is deprecated in favor of
<option>--collation-server</option> as of MySQL 4.1.3. See
<xref linkend="character-sets"/>.
</para>
@@ -19014,9 +19014,9 @@
If you change the character set when running MySQL, that may
also change the sort order. Consequently, you must run
<command>myisamchk -r -q
- --set-collation=<replaceable>charset_name</replaceable></command> on
- all tables, or your indexes may not be ordered correctly. (Use
- <option>--set-character-set</option> before MySQL 4.1.1.)
+ --set-collation=<replaceable>charset_name</replaceable></command>
+ on all tables, or your indexes may not be ordered correctly.
+ (Use <option>--set-character-set</option> before MySQL 4.1.1.)
</para>
<para>
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-4.1/functions.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1101,9 +1101,8 @@
<literal>NULL</literal>. All arguments are treated as
integers. It is required that <replaceable>N1</replaceable>
< <replaceable>N2</replaceable> <
- <replaceable>N3</replaceable> <
- <literal>...</literal> <
- <replaceable>Nn</replaceable> for this function to work
+ <replaceable>N3</replaceable> < <literal>...</literal>
+ < <replaceable>Nn</replaceable> for this function to work
correctly. This is because a binary search is used (very
fast).
</para>
@@ -2346,9 +2345,9 @@
Returns the index (position) of <replaceable>str</replaceable>
in the <replaceable>str1</replaceable>,
<replaceable>str2</replaceable>,
- <replaceable>str3</replaceable>, <literal>...</literal>
- list. Returns <literal>0</literal> if
- <replaceable>str</replaceable> is not found.
+ <replaceable>str3</replaceable>, <literal>...</literal> list.
+ Returns <literal>0</literal> if <replaceable>str</replaceable>
+ is not found.
</para>
<para>
@@ -2943,8 +2942,8 @@
<replaceable>str2</replaceable> to bit 1, and so on.
<literal>NULL</literal> values in
<replaceable>str1</replaceable>,
- <replaceable>str2</replaceable>, <literal>...</literal>
- are not appended to the result.
+ <replaceable>str2</replaceable>, <literal>...</literal> are
+ not appended to the result.
</para>
<remark role="help-description-end"/>
@@ -9472,8 +9471,8 @@
By default (when neither <literal>+</literal> nor
<literal>-</literal> is specified) the word is optional, but
the rows that contain it are rated higher. This mimics the
- behavior of <literal>MATCH() ... AGAINST()</literal>
- without the <literal>IN BOOLEAN MODE</literal> modifier.
+ behavior of <literal>MATCH() ... AGAINST()</literal> without
+ the <literal>IN BOOLEAN MODE</literal> modifier.
</para>
</listitem>
@@ -11121,8 +11120,8 @@
<para>
The cast functions are useful when you want to create a column
- with a specific type in a <literal>CREATE ...
- SELECT</literal> statement:
+ with a specific type in a <literal>CREATE ... SELECT</literal>
+ statement:
</para>
<programlisting>
@@ -13827,7 +13826,8 @@
<remark role="help-description-begin"/>
<para>
- In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement, you can use the
+ In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
+ statement, you can use the
<literal>VALUES(<replaceable>col_name</replaceable>)</literal>
function in the <literal>UPDATE</literal> clause to refer to
column values from the <literal>INSERT</literal> portion of
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-4.1/ndbcluster.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -32,7 +32,7 @@
4.1.10a, it is also available in RPMs compatible with most modern
Linux distributions. (Note that both the
<literal>mysql-server</literal> and <literal>mysql-max</literal>
- RPMs must be installed in order to have MySQL Cluster capability.)
+ RPMs must be installed to have MySQL Cluster capability.)
</para>
<para>
@@ -268,9 +268,9 @@
node in the cluster and setting up individual communication links
between nodes. MySQL Cluster is currently designed with the
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.
+ power, memory space, and bandwidth. In addition, to provide a
+ single point of configuration, all configuration data for the
+ cluster as a whole is located in one configuration file.
</para>
<para>
@@ -449,8 +449,8 @@
nodes, arranged in two node groups of two nodes each. Note that
no nodes other than data nodes are shown here, although a
working cluster requires an <command>ndb_mgm</command> process
- for cluster management and at least one SQL node in order to
- access the data stored by the cluster.
+ for cluster management and at least one SQL node to access the
+ data stored by the cluster.
</para>
<mediaobject>
@@ -722,12 +722,12 @@
are simple: all that is needed is a production release of
MySQL-max 4.1.3 or newer; you must use the
<link linkend="mysqld-max"><literal>-max</literal> version of
- MySQL</link> in order to have Cluster support. It is not
- necessary to compile MySQL yourself merely to be able to use
- Cluster. In this How-To, we assume that you are using the
- <literal>-max</literal> binary appropriate to your Linux,
- Solaris, or Mac OS X operating system, available via the MySQL
- software downloads page at <ulink url="&base-url-downloads;"/>.
+ MySQL</link> to have Cluster support. It is not necessary to
+ compile MySQL yourself merely to be able to use Cluster. In this
+ How-To, we assume that you are using the <literal>-max</literal>
+ binary appropriate to your Linux, Solaris, or Mac OS X operating
+ system, available via the MySQL software downloads page at
+ <ulink url="&base-url-downloads;"/>.
</para>
<para>
@@ -1247,7 +1247,7 @@
<filename>/etc/init.d</filename> to start the MySQL server
process on the SQL node. Note that you need to install the
<literal>-max</literal> server RPM <emphasis>in addition
- to</emphasis> the Standard server RPM in order to run the
+ to</emphasis> the Standard server RPM to run the
<literal>-max</literal> server binary.
</para>
</listitem>
@@ -1321,8 +1321,8 @@
Tables must be created with the <option>ENGINE=NDB</option>
or <option>ENGINE=NDBCLUSTER</option> option, or be altered
(using <literal>ALTER TABLE</literal>) to use the NDB
- CLuster storage engine in order to have them replicated in
- the cluster. If you are importing tables from an existing
+ CLuster storage engine to have them replicated in the
+ cluster. If you are importing tables from an existing
database using the output of <command>mysqldump</command>,
you can open the SQL script or scripts in a text editor and
add this option to any table creation statements, or replace
@@ -1746,10 +1746,10 @@
<para>
The MySQL server is a part of the cluster, so it will also need to
- know how to access an MGM node in order to obtain the cluster
- configuration data. The default behavior is to look for the MGM
- node on <literal>localhost</literal>. However, should you need to
- specify its location elsewhere, this can be done in
+ know how to access an MGM node to obtain the cluster configuration
+ data. The default behavior is to look for the MGM node on
+ <literal>localhost</literal>. However, should you need to specify
+ its location elsewhere, this can be done in
<filename>my.cnf</filename> or on the MySQL server command line.
Before the <literal>NDB</literal> storage engine can be used, at
least one MGM node must be operational, as well as any desired
@@ -2017,8 +2017,8 @@
<para>
You can then use the <command>SHOW</command> command from within
- the management client in order to obtain a report on the
- cluster's status:
+ the management client to obtain a report on the cluster's
+ status:
</para>
<programlisting>
@@ -2948,7 +2948,7 @@
for these, it is important to understand how
<literal>DataMemory</literal> and
<literal>IndexMemory</literal> are used, as they usually need
- to be updated in order to reflect actual usage by the cluster:
+ to be updated to reflect actual usage by the cluster:
</para>
<itemizedlist>
@@ -3214,8 +3214,8 @@
<literal>MaxNoOfConcurrentOperations</literal>) are likely
targets for users setting specific values and not using the
default value. The default value is set for systems using
- small transactions, in order to ensure that these do not use
- excessive memory.
+ small transactions, to ensure that these do not use excessive
+ memory.
</para>
<itemizedlist>
@@ -3288,8 +3288,8 @@
Records are kept for each transaction updating cluster
data, both in the transaction coordinator and in the nodes
where the actual updates are performed. These records
- contain state information needed in order to find UNDO
- records for rollback, lock queues, and other purposes.
+ contain state information needed to find UNDO records for
+ rollback, lock queues, and other purposes.
</para>
<para>
@@ -3385,7 +3385,7 @@
involving large numbers of rows or operations may need to
increase these to enable better parallelism in the system,
while users whose applications require relatively small
- transactions can decrease the values in order to save memory.
+ transactions can decrease the values to save memory.
</para>
<itemizedlist>
@@ -3646,8 +3646,8 @@
space must be allocated in blocks of 64MB. In scenarios
requiring a great many updates, the value for
<literal>NoOfFragmentLogFiles</literal> may need to be set
- as high as 300 or even higher in order to provide
- sufficient space for REDO logs.
+ as high as 300 or even higher to provide sufficient space
+ for REDO logs.
</para>
<para>
@@ -4074,8 +4074,8 @@
this parameter should be increased. For example, in the
case of a storage node containing several gigabytes of
data, a period as long as 10-15 minutes (that is, 600,000
- to 1,000,000 milliseconds) might be required in order to
- to perform a node restart.
+ to 1,000,000 milliseconds) might be required to to perform
+ a node restart.
</para>
</listitem>
@@ -4986,10 +4986,9 @@
</para>
<para>
- It is only necessary to define a connection in order to
- override the default connection parameters. In that case it is
- necessary to define at least
- <replaceable>NodeId1</replaceable>,
+ It is only necessary to define a connection to override the
+ default connection parameters. In that case, it is necessary
+ to define at least <replaceable>NodeId1</replaceable>,
<replaceable>NodeId2</replaceable>, and the parameters to
change.
</para>
@@ -5089,7 +5088,7 @@
Specifies the size of the buffer used when receiving data
from the TCP/IP socket. There is seldom any need to change
this parameter from its default value of 64KB, except
- possibly in order to save memory.
+ possibly to save memory.
</para>
</listitem>
@@ -5153,10 +5152,10 @@
the cluster's overall efficiency by allowing the data nodes to
bypass an Ethernet device such as a switch, hub, or router,
thus cutting down on the cluster's latency. It is important to
- note that in order to take the best advantage of direct
- connections in this fashion with more than 2 data nodes, you
- will need to have a direct connection between each data node
- and every other data node in the same node group.
+ note that to take the best advantage of direct connections in
+ this fashion with more than 2 data nodes, you will need to
+ have a direct connection between each data node and every
+ other data node in the same node group.
</para>
</section>
@@ -5920,12 +5919,11 @@
All MySQL Cluster executables (except for
<command>mysqld</command>) take the following options as of
4.1.8. Users of earlier MySQL Cluster versions should note that
- some of these options have been changed in order to make them
- consistent with one another as well as with
- <command>mysqld</command>. (For example, the <option>-V</option>
- switch was <option>-v</option> in earlier versions.) You can use
- the <option>--help</option> option to view a list of supported
- options.
+ some of these options have been changed to make them consistent
+ with one another as well as with <command>mysqld</command>. (For
+ example, the <option>-V</option> switch was <option>-v</option>
+ in earlier versions.) You can use the <option>--help</option>
+ option to view a list of supported options.
</para>
<itemizedlist>
@@ -8129,8 +8127,8 @@
the database tables. (Note that the cluster should have an
empty database when starting to restore a backup.) The restore
program acts as an API to the cluster and therefore requires a
- free connection in order to connect to the cluster. This can
- be verified with the <command>ndb_mgm</command> command
+ free connection to connect to the cluster. This can be
+ verified with the <command>ndb_mgm</command> command
<command>SHOW</command> (you can accomplish this from a system
shell using <command>ndb_mgm -e SHOW</command>). The
<option>-c <replaceable>connectstring</replaceable></option>
@@ -8545,7 +8543,7 @@
single failure can hinder more than one of them. With 32
computers and 2 switches it is possible to configure the cluster
in such a manner that no single failure can cause the loss of
- more than two nodes; in this case it is also possible to know
+ more than two nodes; in this case, it is also possible to know
which pair of nodes is affected. Thus, by placing the two nodes
in separate node groups, it is possible to build a
<quote>safe</quote> MySQL Cluster installation.
@@ -8672,12 +8670,12 @@
To ensure that SCI sockets are actually being used, you can
employ the <command>latency_bench</command> test program. Using
this utility's server component, clients can connect to the
- server in order to test the latency of the connection;
- determining whether SCI is enabled should be fairly simple from
- observing the latency. (<emphasis role="bold">Note</emphasis>:
- Before using <command>latency_bench</command>, it is necessary
- to set the <literal>LD_PRELOAD</literal> environment variable as
- shown later in this section.)
+ server to test the latency of the connection; determining
+ whether SCI is enabled should be fairly simple from observing
+ the latency. (<emphasis role="bold">Note</emphasis>: Before
+ using <command>latency_bench</command>, it is necessary to set
+ the <literal>LD_PRELOAD</literal> environment variable as shown
+ later in this section.)
</para>
<para>
@@ -9034,10 +9032,10 @@
<literal>TEXT</literal>, or <literal>VARCHAR</literal>
column, then the <literal>READ_COMMITTED</literal>
transaction isolation level is converted to a read
- with read lock. This is done in order to guarantee
- consistency, due to the fact that parts of the values
- stored in columns of these types are actually read
- from a separate table.
+ with read lock. This is done to guarantee consistency,
+ due to the fact that parts of the values stored in
+ columns of these types are actually read from a
+ separate table.
</para>
</listitem>
@@ -9507,8 +9505,8 @@
management and SQL nodes, and two computers to serve as
storage nodes. The purpose of the two data nodes is to provide
redundancy; the management node must run on a separate machine
- in order to guarantee continued arbitration services in the
- event that one of the data nodes fails.
+ to guarantee continued arbitration services in the event that
+ one of the data nodes fails.
</para>
</listitem>
@@ -9814,7 +9812,7 @@
<ulink url="&base-url-downloads;"/> instead. You can also
obtain <literal>NDB</literal> support by compiling the
<literal>-max</literal> binaries from source, but it is not
- necessary to do so simply in order to use MySQL Cluster.
+ necessary to do so simply to use MySQL Cluster.
</para>
</listitem>
@@ -9984,8 +9982,8 @@
<para>
It is possible but not advisable. One of the chief reasons to
- run a cluster is to provide redundancy; in order to enjoy the
- full benefits of this redundancy, each node should reside on a
+ run a cluster is to provide redundancy; to enjoy the full
+ benefits of this redundancy, each node should reside on a
separate machine. If you place multiple nodes on a single
machine and that machine fails, you lose all of those nodes.
Given that MySQL Cluster can be run on commodity hardware
@@ -10046,9 +10044,9 @@
<para>
In a future MySQL Cluster release series, we hope to implement
a <quote>hot</quote> reconfiguration capability for MySQL
- Cluster in order to minimize (if not eliminate) requirements
- for restarting the cluster when adding new nodes. However,
- this is not planned for the MySQL 4.1 release series.
+ Cluster to minimize (if not eliminate) requirements for
+ restarting the cluster when adding new nodes. However, this is
+ not planned for the MySQL 4.1 release series.
</para>
</listitem>
@@ -10665,8 +10663,8 @@
occasionally <quote>storage nodes.</quote> In addition, SQL
nodes were sometimes known as <quote>client nodes</quote> or
<quote>API nodes.</quote> This older terminology has been
- deprecated in order to minimize confusion, and for these
- reasons should be avoided.
+ deprecated to minimize confusion, and for these reasons should
+ be avoided.
</para>
</listitem>
Modified: trunk/refman-4.1/porting.xml
===================================================================
--- trunk/refman-4.1/porting.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-4.1/porting.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -409,7 +409,7 @@
</itemizedlist>
<para>
- In this case you should set the following environment variable
+ In this case, you should set the following environment variable
in the shell before starting <command>gdb</command>:
</para>
@@ -723,16 +723,12 @@
</para>
<para>
- It's not a good sign if <command>mysqld</command> did die
- unexpectedly, but in this case one shouldn't investigate the
- <literal>Checking table...</literal> messages but instead try to
- find out why <command>mysqld</command> died.
+ It is not a good sign if <command>mysqld</command> did die
+ unexpectedly, but in this case, you should not investigate the
+ <literal>Checking table...</literal> messages, but instead try
+ to find out why <command>mysqld</command> died.
</para>
- <remark role="todo">
- correct the spelling of this node to "Reproducible"
- </remark>
-
</section>
<section id="reproducible-test-case">
Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-4.1/problems.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1812,7 +1812,7 @@
</para>
<programlisting>
-MySQL Connection Failed: Can't initialize character set charset_name
+MySQL Connection Failed: Can't initialize character set <replaceable>charset_name</replaceable>
</programlisting>
<para>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-4.1/sql-syntax.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -239,13 +239,13 @@
<literal>IGNORE</literal> is a MySQL extension to standard
SQL. It controls how <literal>ALTER TABLE</literal> works if
there are duplicates on unique keys in the new table or if
- warnings occur when <literal>STRICT</literal> mode is
- enabled. If <literal>IGNORE</literal> is not specified, the
- copy is aborted and rolled back if duplicate-key errors
- occur. If <literal>IGNORE</literal> is specified, only the
- first row is used of rows with duplicates on a unique key,
- The other conflicting rows are deleted. Incorrect values are
- truncated to the closest matching acceptable value.
+ warnings occur when strict mode is enabled. If
+ <literal>IGNORE</literal> is not specified, the copy is
+ aborted and rolled back if duplicate-key errors occur. If
+ <literal>IGNORE</literal> is specified, only the first row
+ is used of rows with duplicates on a unique key, The other
+ conflicting rows are deleted. Incorrect values are truncated
+ to the closest matching acceptable value.
</para>
</listitem>
@@ -3524,8 +3524,8 @@
</para>
<para>
- <literal>DO</literal> is useful primarily with functions that have
- side effects, such as <literal>RELEASE_LOCK()</literal>.
+ <literal>DO</literal> is useful primarily with functions that
+ have side effects, such as <literal>RELEASE_LOCK()</literal>.
</para>
<remark role="help-description-end"/>
@@ -4962,7 +4962,7 @@
<para>
If you specify <literal>REPLACE</literal>, input rows replace
existing rows (in other words, rows that have the same value for
- a primary or unique index as an existing row). See
+ a primary key or unique index as an existing row). See
<xref linkend="replace"/>.
</para>
@@ -5856,7 +5856,7 @@
<listitem>
<para>
While the insertion fails because a duplicate-key error
- occurs for a primary or unique key:
+ occurs for a primary key or unique index:
</para>
<orderedlist>
@@ -8284,7 +8284,7 @@
legal in <literal>UPDATE</literal> and
<literal>DELETE</literal> statements as well as in
<literal>SELECT</literal> statements. However, you cannot
- use the same table (in this case table
+ use the same table (in this case, table
<literal>t1</literal>) for both the subquery's
<literal>FROM</literal> clause and the update target.
</para>
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/apis.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1585,7 +1585,7 @@
<row>
<entry><emphasis role="bold">mysql_real_escape_string()</emphasis></entry>
<entry>Escapes special characters in a string for use in an SQL statement,
- taking into account the current charset of the
+ taking into account the current character set of the
connection.</entry>
</row>
<row>
@@ -2041,7 +2041,7 @@
<para>
Note that when you use a <literal>REPLACE</literal> command,
<literal>mysql_affected_rows()</literal> returns 2 if the new
- row replaced an old row, because in this case one row was
+ row replaced an old row, because in this case, one row was
inserted after the duplicate was deleted.
</para>
@@ -2122,7 +2122,7 @@
<para>
<literal>mysql_change_user()</literal> fails if the connected
user cannot be authenticated or doesn't have permission to use
- the database. In this case the user and database are not
+ the database. In this case, the user and database are not
changed
</para>
@@ -2432,7 +2432,7 @@
corresponding parameters for
<literal>mysql_real_connect()</literal> with the difference
that the connection parameter may be <literal>NULL</literal>.
- In this case the C API allocates memory for the connection
+ In this case, the C API allocates memory for the connection
structure automatically and frees it when you call
<literal>mysql_close()</literal>. The disadvantage of this
approach is that you can't retrieve an error message if the
@@ -3123,8 +3123,8 @@
connection handler as its first argument and escapes the
string according to the current character set.
<literal>mysql_escape_string()</literal> does not take a
- connection argument and does not respect the current charset
- setting.
+ connection argument and does not respect the current character
+ set.
</para>
</section>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -9066,7 +9066,7 @@
‘<literal>_</literal>’ wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a ‘<literal>_</literal>’ in the
- name, because in this case <command>mysqlshow</command> shows
+ name, because in this case, <command>mysqlshow</command> shows
you only the table names that match the pattern. This is
easily fixed by adding an extra
‘<literal>%</literal>’ last on the command line as
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/database-administration.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -617,8 +617,9 @@
</para>
<para>
- Use <replaceable>collation_name</replaceable> as the default
- server collation. See <xref linkend="character-sets"/>.
+ Use <replaceable>collation_name</replaceable> as the
+ default server collation. See
+ <xref linkend="character-sets"/>.
</para>
</listitem>
@@ -701,8 +702,8 @@
</para>
<para>
- Use <replaceable>collation_name</replaceable> as the default
- collation. This option is deprecated in favor of
+ Use <replaceable>collation_name</replaceable> as the
+ default collation. This option is deprecated in favor of
<option>--collation-server</option>. See
<xref linkend="character-sets"/>.
</para>
@@ -21253,8 +21254,8 @@
If you change the character set when running MySQL, that may
also change the sort order. Consequently, you must run
<command>myisamchk -r -q
- --set-collation=<replaceable>charset_name</replaceable></command> on
- all tables, or your indexes may not be ordered correctly.
+ --set-collation=<replaceable>charset_name</replaceable></command>
+ on all tables, or your indexes may not be ordered correctly.
</para>
<para>
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/functions.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1170,9 +1170,8 @@
<literal>NULL</literal>. All arguments are treated as
integers. It is required that <replaceable>N1</replaceable>
< <replaceable>N2</replaceable> <
- <replaceable>N3</replaceable> <
- <literal>...</literal> <
- <replaceable>Nn</replaceable> for this function to work
+ <replaceable>N3</replaceable> < <literal>...</literal>
+ < <replaceable>Nn</replaceable> for this function to work
correctly. This is because a binary search is used (very
fast).
</para>
@@ -2439,9 +2438,9 @@
Returns the index (position) of <replaceable>str</replaceable>
in the <replaceable>str1</replaceable>,
<replaceable>str2</replaceable>,
- <replaceable>str3</replaceable>, <literal>...</literal>
- list. Returns <literal>0</literal> if
- <replaceable>str</replaceable> is not found.
+ <replaceable>str3</replaceable>, <literal>...</literal> list.
+ Returns <literal>0</literal> if <replaceable>str</replaceable>
+ is not found.
</para>
<para>
@@ -3025,8 +3024,8 @@
<replaceable>str2</replaceable> to bit 1, and so on.
<literal>NULL</literal> values in
<replaceable>str1</replaceable>,
- <replaceable>str2</replaceable>, <literal>...</literal>
- are not appended to the result.
+ <replaceable>str2</replaceable>, <literal>...</literal> are
+ not appended to the result.
</para>
<remark role="help-description-end"/>
@@ -9570,8 +9569,8 @@
By default (when neither <literal>+</literal> nor
<literal>-</literal> is specified) the word is optional, but
the rows that contain it are rated higher. This mimics the
- behavior of <literal>MATCH() ... AGAINST()</literal>
- without the <literal>IN BOOLEAN MODE</literal> modifier.
+ behavior of <literal>MATCH() ... AGAINST()</literal> without
+ the <literal>IN BOOLEAN MODE</literal> modifier.
</para>
</listitem>
@@ -11175,8 +11174,8 @@
<para>
The cast functions are useful when you want to create a column
- with a specific type in a <literal>CREATE ...
- SELECT</literal> statement:
+ with a specific type in a <literal>CREATE ... SELECT</literal>
+ statement:
</para>
<programlisting>
@@ -13901,7 +13900,8 @@
<remark role="help-description-begin"/>
<para>
- In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement, you can use the
+ In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
+ statement, you can use the
<literal>VALUES(<replaceable>col_name</replaceable>)</literal>
function in the <literal>UPDATE</literal> clause to refer to
column values from the <literal>INSERT</literal> portion of
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/installing.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -12341,8 +12341,8 @@
MySQL 5.0.15, the <literal>CHAR()</literal> function returns
a binary string rather than a string in the connection
character set. An optional <literal>USING
- <replaceable>charset_name</replaceable></literal> clause may be
- used to produce a result in a specific character set
+ <replaceable>charset_name</replaceable></literal> clause may
+ be used to produce a result in a specific character set
instead. Also, arguments larger than 256 produce multiple
characters. They are no longer interpreted modulo 256 to
produce a single character each. These changes may cause
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/ndbcluster.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -31,7 +31,7 @@
in MySQL ¤t-series; binary releases and in RPMs compatible
with most modern Linux distributions. (Note that both the
<literal>mysql-server</literal> and <literal>mysql-max</literal>
- RPMs must be installed in order to have MySQL Cluster capability.)
+ RPMs must be installed to have MySQL Cluster capability.)
</para>
<para>
@@ -267,9 +267,9 @@
node in the cluster and setting up individual communication links
between nodes. MySQL Cluster is currently designed with the
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.
+ power, memory space, and bandwidth. In addition, to provide a
+ single point of configuration, all configuration data for the
+ cluster as a whole is located in one configuration file.
</para>
<para>
@@ -448,8 +448,8 @@
nodes, arranged in two node groups of two nodes each. Note that
no nodes other than data nodes are shown here, although a
working cluster requires an <command>ndb_mgm</command> process
- for cluster management and at least one SQL node in order to
- access the data stored by the cluster.
+ for cluster management and at least one SQL node to access the
+ data stored by the cluster.
</para>
<mediaobject>
@@ -721,12 +721,12 @@
are simple: all that is needed is a production release of
MySQL-max ¤t-series;; you must use the
<link linkend="mysqld-max"><literal>-max</literal> version of
- MySQL</link> in order to have Cluster support. It is not
- necessary to compile MySQL yourself merely to be able to use
- Cluster. In this How-To, we assume that you are using the
- <literal>-max</literal> binary appropriate to your Linux,
- Solaris, or Mac OS X operating system, available via the MySQL
- software downloads page at <ulink url="&base-url-downloads;"/>.
+ MySQL</link> to have Cluster support. It is not necessary to
+ compile MySQL yourself merely to be able to use Cluster. In this
+ How-To, we assume that you are using the <literal>-max</literal>
+ binary appropriate to your Linux, Solaris, or Mac OS X operating
+ system, available via the MySQL software downloads page at
+ <ulink url="&base-url-downloads;"/>.
</para>
<para>
@@ -1246,7 +1246,7 @@
<filename>/etc/init.d</filename> to start the MySQL server
process on the SQL node. Note that you need to install the
<literal>-max</literal> server RPM <emphasis>in addition
- to</emphasis> the Standard server RPM in order to run the
+ to</emphasis> the Standard server RPM to run the
<literal>-max</literal> server binary.
</para>
</listitem>
@@ -1320,8 +1320,8 @@
Tables must be created with the <option>ENGINE=NDB</option>
or <option>ENGINE=NDBCLUSTER</option> option, or be altered
(using <literal>ALTER TABLE</literal>) to use the NDB
- CLuster storage engine in order to have them replicated in
- the cluster. If you are importing tables from an existing
+ CLuster storage engine to have them replicated in the
+ cluster. If you are importing tables from an existing
database using the output of <command>mysqldump</command>,
you can open the SQL script or scripts in a text editor and
add this option to any table creation statements, or replace
@@ -1747,10 +1747,10 @@
<para>
The MySQL server is a part of the cluster, so it will also need to
- know how to access an MGM node in order to obtain the cluster
- configuration data. The default behavior is to look for the MGM
- node on <literal>localhost</literal>. However, should you need to
- specify its location elsewhere, this can be done in
+ know how to access an MGM node to obtain the cluster configuration
+ data. The default behavior is to look for the MGM node on
+ <literal>localhost</literal>. However, should you need to specify
+ its location elsewhere, this can be done in
<filename>my.cnf</filename> or on the MySQL server command line.
Before the <literal>NDB</literal> storage engine can be used, at
least one MGM node must be operational, as well as any desired
@@ -2017,8 +2017,8 @@
<para>
You can then use the <command>SHOW</command> command from within
- the management client in order to obtain a report on the
- cluster's status:
+ the management client to obtain a report on the cluster's
+ status:
</para>
<programlisting>
@@ -2938,7 +2938,7 @@
for these, it is important to understand how
<literal>DataMemory</literal> and
<literal>IndexMemory</literal> are used, as they usually need
- to be updated in order to reflect actual usage by the cluster:
+ to be updated to reflect actual usage by the cluster:
</para>
<itemizedlist>
@@ -3212,8 +3212,8 @@
<literal>MaxNoOfConcurrentOperations</literal>) are likely
targets for users setting specific values and not using the
default value. The default value is set for systems using
- small transactions, in order to ensure that these do not use
- excessive memory.
+ small transactions, to ensure that these do not use excessive
+ memory.
</para>
<itemizedlist>
@@ -3286,8 +3286,8 @@
Records are kept for each transaction updating cluster
data, both in the transaction coordinator and in the nodes
where the actual updates are performed. These records
- contain state information needed in order to find UNDO
- records for rollback, lock queues, and other purposes.
+ contain state information needed to find UNDO records for
+ rollback, lock queues, and other purposes.
</para>
<para>
@@ -3383,7 +3383,7 @@
involving large numbers of rows or operations may need to
increase these to enable better parallelism in the system,
while users whose applications require relatively small
- transactions can decrease the values in order to save memory.
+ transactions can decrease the values to save memory.
</para>
<itemizedlist>
@@ -3648,8 +3648,8 @@
space must be allocated in blocks of 64MB. In scenarios
requiring a great many updates, the value for
<literal>NoOfFragmentLogFiles</literal> may need to be set
- as high as 300 or even higher in order to provide
- sufficient space for REDO logs.
+ as high as 300 or even higher to provide sufficient space
+ for REDO logs.
</para>
<para>
@@ -4080,8 +4080,8 @@
this parameter should be increased. For example, in the
case of a storage node containing several gigabytes of
data, a period as long as 10-15 minutes (that is, 600,000
- to 1,000,000 milliseconds) might be required in order to
- to perform a node restart.
+ to 1,000,000 milliseconds) might be required to to perform
+ a node restart.
</para>
</listitem>
@@ -4992,10 +4992,9 @@
</para>
<para>
- It is only necessary to define a connection in order to
- override the default connection parameters. In that case it is
- necessary to define at least
- <replaceable>NodeId1</replaceable>,
+ It is only necessary to define a connection to override the
+ default connection parameters. In that case, it is necessary
+ to define at least <replaceable>NodeId1</replaceable>,
<replaceable>NodeId2</replaceable>, and the parameters to
change.
</para>
@@ -5095,7 +5094,7 @@
Specifies the size of the buffer used when receiving data
from the TCP/IP socket. There is seldom any need to change
this parameter from its default value of 64KB, except
- possibly in order to save memory.
+ possibly to save memory.
</para>
</listitem>
@@ -5159,10 +5158,10 @@
the cluster's overall efficiency by allowing the data nodes to
bypass an Ethernet device such as a switch, hub, or router,
thus cutting down on the cluster's latency. It is important to
- note that in order to take the best advantage of direct
- connections in this fashion with more than 2 data nodes, you
- will need to have a direct connection between each data node
- and every other data node in the same node group.
+ note that to take the best advantage of direct connections in
+ this fashion with more than 2 data nodes, you will need to
+ have a direct connection between each data node and every
+ other data node in the same node group.
</para>
</section>
@@ -8102,8 +8101,8 @@
the database tables. (Note that the cluster should have an
empty database when starting to restore a backup.) The restore
program acts as an API to the cluster and therefore requires a
- free connection in order to connect to the cluster. This can
- be verified with the <command>ndb_mgm</command> command
+ free connection to connect to the cluster. This can be
+ verified with the <command>ndb_mgm</command> command
<command>SHOW</command> (you can accomplish this from a system
shell using <command>ndb_mgm -e SHOW</command>). The
<option>-c <replaceable>connectstring</replaceable></option>
@@ -8517,7 +8516,7 @@
single failure can hinder more than one of them. With 32
computers and 2 switches it is possible to configure the cluster
in such a manner that no single failure can cause the loss of
- more than two nodes; in this case it is also possible to know
+ more than two nodes; in this case, it is also possible to know
which pair of nodes is affected. Thus, by placing the two nodes
in separate node groups, it is possible to build a
<quote>safe</quote> MySQL Cluster installation.
@@ -8644,12 +8643,12 @@
To ensure that SCI sockets are actually being used, you can
employ the <command>latency_bench</command> test program. Using
this utility's server component, clients can connect to the
- server in order to test the latency of the connection;
- determining whether SCI is enabled should be fairly simple from
- observing the latency. (<emphasis role="bold">Note</emphasis>:
- Before using <command>latency_bench</command>, it is necessary
- to set the <literal>LD_PRELOAD</literal> environment variable as
- shown later in this section.)
+ server to test the latency of the connection; determining
+ whether SCI is enabled should be fairly simple from observing
+ the latency. (<emphasis role="bold">Note</emphasis>: Before
+ using <command>latency_bench</command>, it is necessary to set
+ the <literal>LD_PRELOAD</literal> environment variable as shown
+ later in this section.)
</para>
<para>
@@ -9008,10 +9007,10 @@
<literal>TEXT</literal>, or <literal>VARCHAR</literal>
column, then the <literal>READ_COMMITTED</literal>
transaction isolation level is converted to a read
- with read lock. This is done in order to guarantee
- consistency, due to the fact that parts of the values
- stored in columns of these types are actually read
- from a separate table.
+ with read lock. This is done to guarantee consistency,
+ due to the fact that parts of the values stored in
+ columns of these types are actually read from a
+ separate table.
</para>
</listitem>
@@ -9782,8 +9781,8 @@
management and SQL nodes, and two computers to serve as
storage nodes. The purpose of the two data nodes is to provide
redundancy; the management node must run on a separate machine
- in order to guarantee continued arbitration services in the
- event that one of the data nodes fails.
+ to guarantee continued arbitration services in the event that
+ one of the data nodes fails.
</para>
</listitem>
@@ -10268,8 +10267,8 @@
<para>
It is possible but not advisable. One of the chief reasons to
- run a cluster is to provide redundancy; in order to enjoy the
- full benefits of this redundancy, each node should reside on a
+ run a cluster is to provide redundancy; to enjoy the full
+ benefits of this redundancy, each node should reside on a
separate machine. If you place multiple nodes on a single
machine and that machine fails, you lose all of those nodes.
Given that MySQL Cluster can be run on commodity hardware
@@ -10330,8 +10329,8 @@
<para>
In a future MySQL Cluster release series, we hope to implement
a <quote>hot</quote> reconfiguration capability for MySQL
- Cluster in order to minimize (if not eliminate) the
- requirement for restarting the cluster when adding new nodes.
+ Cluster to minimize (if not eliminate) the requirement for
+ restarting the cluster when adding new nodes.
</para>
</listitem>
@@ -10948,8 +10947,8 @@
occasionally <quote>storage nodes.</quote> In addition, SQL
nodes were sometimes known as <quote>client nodes</quote> or
<quote>API nodes.</quote> This older terminology has been
- deprecated in order to minimize confusion, and for these
- reasons should be avoided.
+ deprecated to minimize confusion, and for these reasons should
+ be avoided.
</para>
</listitem>
Modified: trunk/refman-5.0/porting.xml
===================================================================
--- trunk/refman-5.0/porting.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/porting.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -409,7 +409,7 @@
</itemizedlist>
<para>
- In this case you should set the following environment variable
+ In this case, you should set the following environment variable
in the shell before starting <command>gdb</command>:
</para>
@@ -723,16 +723,12 @@
</para>
<para>
- It's not a good sign if <command>mysqld</command> did die
- unexpectedly, but in this case one shouldn't investigate the
- <literal>Checking table...</literal> messages but instead try to
- find out why <command>mysqld</command> died.
+ It is not a good sign if <command>mysqld</command> did die
+ unexpectedly, but in this case, you should not investigate the
+ <literal>Checking table...</literal> messages, but instead try
+ to find out why <command>mysqld</command> died.
</para>
- <remark role="todo">
- correct the spelling of this node to "Reproducible"
- </remark>
-
</section>
<section id="reproducible-test-case">
Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/problems.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1781,7 +1781,7 @@
</para>
<programlisting>
-MySQL Connection Failed: Can't initialize character set charset_name
+MySQL Connection Failed: Can't initialize character set <replaceable>charset_name</replaceable>
</programlisting>
<para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -282,13 +282,13 @@
<literal>IGNORE</literal> is a MySQL extension to standard
SQL. It controls how <literal>ALTER TABLE</literal> works if
there are duplicates on unique keys in the new table or if
- warnings occur when <literal>STRICT</literal> mode is
- enabled. If <literal>IGNORE</literal> is not specified, the
- copy is aborted and rolled back if duplicate-key errors
- occur. If <literal>IGNORE</literal> is specified, only the
- first row is used of rows with duplicates on a unique key,
- The other conflicting rows are deleted. Incorrect values are
- truncated to the closest matching acceptable value.
+ warnings occur when strict mode is enabled. If
+ <literal>IGNORE</literal> is not specified, the copy is
+ aborted and rolled back if duplicate-key errors occur. If
+ <literal>IGNORE</literal> is specified, only the first row
+ is used of rows with duplicates on a unique key, The other
+ conflicting rows are deleted. Incorrect values are truncated
+ to the closest matching acceptable value.
</para>
</listitem>
@@ -3479,8 +3479,8 @@
</para>
<para>
- <literal>DO</literal> is useful primarily with functions that have
- side effects, such as <literal>RELEASE_LOCK()</literal>.
+ <literal>DO</literal> is useful primarily with functions that
+ have side effects, such as <literal>RELEASE_LOCK()</literal>.
</para>
<remark role="help-description-end"/>
@@ -3812,8 +3812,7 @@
If you want an <literal>INSERT</literal> statement to
generate an error unless you explicitly specify values for
all columns that do not have a default value, you should use
- <literal>STRICT</literal> mode. See
- <xref linkend="server-sql-mode"/>.
+ strict mode. See <xref linkend="server-sql-mode"/>.
</para>
</listitem>
@@ -3850,10 +3849,10 @@
</programlisting>
<para>
- In <literal>STRICT</literal> mode you will get an error if a
- column doesn't have a default value. Otherwise, MySQL will
- use the implicit default value for any column without an
- explicitly defined default.
+ In strict mode, you will get an error if a column doesn't
+ have a default value. Otherwise, MySQL will use the implicit
+ default value for any column without an explicitly defined
+ default.
</para>
</listitem>
@@ -4882,7 +4881,7 @@
<para>
If you specify <literal>REPLACE</literal>, input rows replace
existing rows (in other words, rows that have the same value for
- a primary or unique index as an existing row). See
+ a primary key or unique index as an existing row). See
<xref linkend="replace"/>.
</para>
@@ -5870,7 +5869,7 @@
<listitem>
<para>
While the insertion fails because a duplicate-key error
- occurs for a primary or unique key:
+ occurs for a primary key or unique index:
</para>
<orderedlist>
@@ -8650,7 +8649,7 @@
legal in <literal>UPDATE</literal> and
<literal>DELETE</literal> statements as well as in
<literal>SELECT</literal> statements. However, you cannot
- use the same table (in this case table
+ use the same table (in this case, table
<literal>t1</literal>) for both the subquery's
<literal>FROM</literal> clause and the update target.
</para>
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/apis.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1584,7 +1584,7 @@
<row>
<entry><emphasis role="bold">mysql_real_escape_string()</emphasis></entry>
<entry>Escapes special characters in a string for use in an SQL statement,
- taking into account the current charset of the
+ taking into account the current character set of the
connection.</entry>
</row>
<row>
@@ -2039,7 +2039,7 @@
<para>
Note that when you use a <literal>REPLACE</literal> command,
<literal>mysql_affected_rows()</literal> returns 2 if the new
- row replaced an old row, because in this case one row was
+ row replaced an old row, because in this case, one row was
inserted after the duplicate was deleted.
</para>
@@ -2120,7 +2120,7 @@
<para>
<literal>mysql_change_user()</literal> fails if the connected
user cannot be authenticated or doesn't have permission to use
- the database. In this case the user and database are not
+ the database. In this case, the user and database are not
changed
</para>
@@ -2429,7 +2429,7 @@
corresponding parameters for
<literal>mysql_real_connect()</literal> with the difference
that the connection parameter may be <literal>NULL</literal>.
- In this case the C API allocates memory for the connection
+ In this case, the C API allocates memory for the connection
structure automatically and frees it when you call
<literal>mysql_close()</literal>. The disadvantage of this
approach is that you can't retrieve an error message if the
@@ -3120,8 +3120,8 @@
connection handler as its first argument and escapes the
string according to the current character set.
<literal>mysql_escape_string()</literal> does not take a
- connection argument and does not respect the current charset
- setting.
+ connection argument and does not respect the current character
+ set.
</para>
</section>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -9102,7 +9102,7 @@
‘<literal>_</literal>’ wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a ‘<literal>_</literal>’ in the
- name, because in this case <command>mysqlshow</command> shows
+ name, because in this case, <command>mysqlshow</command> shows
you only the table names that match the pattern. This is
easily fixed by adding an extra
‘<literal>%</literal>’ last on the command line as
Modified: trunk/refman-5.1/custom-engine.xml
===================================================================
--- trunk/refman-5.1/custom-engine.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/custom-engine.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1011,8 +1011,8 @@
</para>
<para>
- When releasing locks, <function>store_lock()</function> are also
- called. In this case one usually doesn't have to do anything.
+ When releasing locks, <function>store_lock()</function> is also
+ called. In this case, one usually doesn't have to do anything.
</para>
<para>
@@ -15087,7 +15087,7 @@
</para>
<para>
- In this case we will set the column to the value of
+ In this case, we will set the column to the value of
next_insert_id. The next row will be given the id
next_insert_id(next_insert_id)
</para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/database-administration.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -643,8 +643,9 @@
</para>
<para>
- Use <replaceable>collation_name</replaceable> as the default
- server collation. See <xref linkend="character-sets"/>.
+ Use <replaceable>collation_name</replaceable> as the
+ default server collation. See
+ <xref linkend="character-sets"/>.
</para>
</listitem>
@@ -727,8 +728,8 @@
</para>
<para>
- Use <replaceable>collation_name</replaceable> as the default
- collation. This option is deprecated in favor of
+ Use <replaceable>collation_name</replaceable> as the
+ default collation. This option is deprecated in favor of
<option>--collation-server</option>. See
<xref linkend="character-sets"/>.
</para>
@@ -21266,8 +21267,8 @@
If you change the character set when running MySQL, that may
also change the sort order. Consequently, you must run
<command>myisamchk -r -q
- --set-collation=<replaceable>charset_name</replaceable></command> on
- all tables, or your indexes may not be ordered correctly.
+ --set-collation=<replaceable>charset_name</replaceable></command>
+ on all tables, or your indexes may not be ordered correctly.
</para>
<para>
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/functions.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1161,9 +1161,8 @@
<literal>NULL</literal>. All arguments are treated as
integers. It is required that <replaceable>N1</replaceable>
< <replaceable>N2</replaceable> <
- <replaceable>N3</replaceable> <
- <literal>...</literal> <
- <replaceable>Nn</replaceable> for this function to work
+ <replaceable>N3</replaceable> < <literal>...</literal>
+ < <replaceable>Nn</replaceable> for this function to work
correctly. This is because a binary search is used (very
fast).
</para>
@@ -2411,9 +2410,9 @@
Returns the index (position) of <replaceable>str</replaceable>
in the <replaceable>str1</replaceable>,
<replaceable>str2</replaceable>,
- <replaceable>str3</replaceable>, <literal>...</literal>
- list. Returns <literal>0</literal> if
- <replaceable>str</replaceable> is not found.
+ <replaceable>str3</replaceable>, <literal>...</literal> list.
+ Returns <literal>0</literal> if <replaceable>str</replaceable>
+ is not found.
</para>
<para>
@@ -2997,8 +2996,8 @@
<replaceable>str2</replaceable> to bit 1, and so on.
<literal>NULL</literal> values in
<replaceable>str1</replaceable>,
- <replaceable>str2</replaceable>, <literal>...</literal>
- are not appended to the result.
+ <replaceable>str2</replaceable>, <literal>...</literal> are
+ not appended to the result.
</para>
<remark role="help-description-end"/>
@@ -9522,8 +9521,8 @@
By default (when neither <literal>+</literal> nor
<literal>-</literal> is specified) the word is optional, but
the rows that contain it are rated higher. This mimics the
- behavior of <literal>MATCH() ... AGAINST()</literal>
- without the <literal>IN BOOLEAN MODE</literal> modifier.
+ behavior of <literal>MATCH() ... AGAINST()</literal> without
+ the <literal>IN BOOLEAN MODE</literal> modifier.
</para>
</listitem>
@@ -11118,8 +11117,8 @@
<para>
The cast functions are useful when you want to create a column
- with a specific type in a <literal>CREATE ...
- SELECT</literal> statement:
+ with a specific type in a <literal>CREATE ... SELECT</literal>
+ statement:
</para>
<programlisting>
@@ -14288,7 +14287,8 @@
<remark role="help-description-begin"/>
<para>
- In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement, you can use the
+ In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
+ statement, you can use the
<literal>VALUES(<replaceable>col_name</replaceable>)</literal>
function in the <literal>UPDATE</literal> clause to refer to
column values from the <literal>INSERT</literal> portion of
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/ndbcluster.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -31,7 +31,7 @@
in MySQL ¤t-series; binary releases and in RPMs compatible
with most modern Linux distributions. (Note that both the
<literal>mysql-server</literal> and <literal>mysql-max</literal>
- RPMs must be installed in order to have MySQL Cluster capability.)
+ RPMs must be installed to have MySQL Cluster capability.)
</para>
<para>
@@ -267,9 +267,9 @@
node in the cluster and setting up individual communication links
between nodes. MySQL Cluster is currently designed with the
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.
+ power, memory space, and bandwidth. In addition, to provide a
+ single point of configuration, all configuration data for the
+ cluster as a whole is located in one configuration file.
</para>
<para>
@@ -448,8 +448,8 @@
nodes, arranged in two node groups of two nodes each. Note that
no nodes other than data nodes are shown here, although a
working cluster requires an <command>ndb_mgm</command> process
- for cluster management and at least one SQL node in order to
- access the data stored by the cluster.
+ for cluster management and at least one SQL node to access the
+ data stored by the cluster.
</para>
<mediaobject>
@@ -721,12 +721,12 @@
are simple: all that is needed is a production release of
MySQL-max ¤t-series;; you must use the
<link linkend="mysqld-max"><literal>-max</literal> version of
- MySQL</link> in order to have Cluster support. It is not
- necessary to compile MySQL yourself merely to be able to use
- Cluster. In this How-To, we assume that you are using the
- <literal>-max</literal> binary appropriate to your Linux,
- Solaris, or Mac OS X operating system, available via the MySQL
- software downloads page at <ulink url="&base-url-downloads;"/>.
+ MySQL</link> to have Cluster support. It is not necessary to
+ compile MySQL yourself merely to be able to use Cluster. In this
+ How-To, we assume that you are using the <literal>-max</literal>
+ binary appropriate to your Linux, Solaris, or Mac OS X operating
+ system, available via the MySQL software downloads page at
+ <ulink url="&base-url-downloads;"/>.
</para>
<para>
@@ -1246,7 +1246,7 @@
<filename>/etc/init.d</filename> to start the MySQL server
process on the SQL node. Note that you need to install the
<literal>-max</literal> server RPM <emphasis>in addition
- to</emphasis> the Standard server RPM in order to run the
+ to</emphasis> the Standard server RPM to run the
<literal>-max</literal> server binary.
</para>
</listitem>
@@ -1320,8 +1320,8 @@
Tables must be created with the <option>ENGINE=NDB</option>
or <option>ENGINE=NDBCLUSTER</option> option, or be altered
(using <literal>ALTER TABLE</literal>) to use the NDB
- CLuster storage engine in order to have them replicated in
- the cluster. If you are importing tables from an existing
+ CLuster storage engine to have them replicated in the
+ cluster. If you are importing tables from an existing
database using the output of <command>mysqldump</command>,
you can open the SQL script or scripts in a text editor and
add this option to any table creation statements, or replace
@@ -1745,10 +1745,10 @@
<para>
The MySQL server is a part of the cluster, so it will also need to
- know how to access an MGM node in order to obtain the cluster
- configuration data. The default behavior is to look for the MGM
- node on <literal>localhost</literal>. However, should you need to
- specify its location elsewhere, this can be done in
+ know how to access an MGM node to obtain the cluster configuration
+ data. The default behavior is to look for the MGM node on
+ <literal>localhost</literal>. However, should you need to specify
+ its location elsewhere, this can be done in
<filename>my.cnf</filename> or on the MySQL server command line.
Before the <literal>NDB</literal> storage engine can be used, at
least one MGM node must be operational, as well as any desired
@@ -2015,8 +2015,8 @@
<para>
You can then use the <command>SHOW</command> command from within
- the management client in order to obtain a report on the
- cluster's status:
+ the management client to obtain a report on the cluster's
+ status:
</para>
<programlisting>
@@ -2936,7 +2936,7 @@
for these, it is important to understand how
<literal>DataMemory</literal> and
<literal>IndexMemory</literal> are used, as they usually need
- to be updated in order to reflect actual usage by the cluster:
+ to be updated to reflect actual usage by the cluster:
</para>
<itemizedlist>
@@ -3210,8 +3210,8 @@
<literal>MaxNoOfConcurrentOperations</literal>) are likely
targets for users setting specific values and not using the
default value. The default value is set for systems using
- small transactions, in order to ensure that these do not use
- excessive memory.
+ small transactions, to ensure that these do not use excessive
+ memory.
</para>
<itemizedlist>
@@ -3284,8 +3284,8 @@
Records are kept for each transaction updating cluster
data, both in the transaction coordinator and in the nodes
where the actual updates are performed. These records
- contain state information needed in order to find UNDO
- records for rollback, lock queues, and other purposes.
+ contain state information needed to find UNDO records for
+ rollback, lock queues, and other purposes.
</para>
<para>
@@ -3381,7 +3381,7 @@
involving large numbers of rows or operations may need to
increase these to enable better parallelism in the system,
while users whose applications require relatively small
- transactions can decrease the values in order to save memory.
+ transactions can decrease the values to save memory.
</para>
<itemizedlist>
@@ -3646,8 +3646,8 @@
space must be allocated in blocks of 64MB. In scenarios
requiring a great many updates, the value for
<literal>NoOfFragmentLogFiles</literal> may need to be set
- as high as 300 or even higher in order to provide
- sufficient space for REDO logs.
+ as high as 300 or even higher to provide sufficient space
+ for REDO logs.
</para>
<para>
@@ -4078,8 +4078,8 @@
this parameter should be increased. For example, in the
case of a storage node containing several gigabytes of
data, a period as long as 10-15 minutes (that is, 600,000
- to 1,000,000 milliseconds) might be required in order to
- to perform a node restart.
+ to 1,000,000 milliseconds) might be required to to perform
+ a node restart.
</para>
</listitem>
@@ -4990,10 +4990,9 @@
</para>
<para>
- It is only necessary to define a connection in order to
- override the default connection parameters. In that case it is
- necessary to define at least
- <replaceable>NodeId1</replaceable>,
+ It is only necessary to define a connection to override the
+ default connection parameters. In that case, it is necessary
+ to define at least <replaceable>NodeId1</replaceable>,
<replaceable>NodeId2</replaceable>, and the parameters to
change.
</para>
@@ -5093,7 +5092,7 @@
Specifies the size of the buffer used when receiving data
from the TCP/IP socket. There is seldom any need to change
this parameter from its default value of 64KB, except
- possibly in order to save memory.
+ possibly to save memory.
</para>
</listitem>
@@ -5157,10 +5156,10 @@
the cluster's overall efficiency by allowing the data nodes to
bypass an Ethernet device such as a switch, hub, or router,
thus cutting down on the cluster's latency. It is important to
- note that in order to take the best advantage of direct
- connections in this fashion with more than 2 data nodes, you
- will need to have a direct connection between each data node
- and every other data node in the same node group.
+ note that to take the best advantage of direct connections in
+ this fashion with more than 2 data nodes, you will need to
+ have a direct connection between each data node and every
+ other data node in the same node group.
</para>
</section>
@@ -8100,8 +8099,8 @@
the database tables. (Note that the cluster should have an
empty database when starting to restore a backup.) The restore
program acts as an API to the cluster and therefore requires a
- free connection in order to connect to the cluster. This can
- be verified with the <command>ndb_mgm</command> command
+ free connection to connect to the cluster. This can be
+ verified with the <command>ndb_mgm</command> command
<command>SHOW</command> (you can accomplish this from a system
shell using <command>ndb_mgm -e SHOW</command>). The
<option>-c <replaceable>connectstring</replaceable></option>
@@ -8381,7 +8380,7 @@
A replication channel requires two MySQL servers acting as
replication servers (one each for the master and slave). For
example, this means that in the case of a replication setup with
- two replication channels (in order to provide an extra channel for
+ two replication channels (to provide an extra channel for
redundancy), there will be a total of four replication nodes, two
per cluster.
</para>
@@ -8721,9 +8720,9 @@
<listitem>
<para>
If the master cluster is already in use, you can create a
- backup of the master and load this onto the slave in order to
+ backup of the master and load this onto the slave to
cut down on the amount of time required for the slave to
- synchronise itself with the master. If the slave is also
+ synchronize itself with the master. If the slave is also
running MySQL Cluster, this can be accomplished using the
backup and restore procedure described in
<xref linkend="mysql-cluster-replication-backups"/>.
@@ -8768,7 +8767,7 @@
you should make sure that the slave is started with the
<option>&ddash;skip-slave-start</option> option on the command
line, or else include <literal>skip-slave-start</literal> in
- the slave's <filename>my.cnf</filename> file in order to keep
+ the slave's <filename>my.cnf</filename> file to keep
it from trying to connect to the master to begin replicating
before all the data has been loaded. Once the loading of data
has completed, follow the additional steps outlined in the
@@ -8855,7 +8854,7 @@
<listitem>
<para>
- It is necessary to synchronise the slave server with the
+ It is necessary to synchronize the slave server with the
master server's replication binlog. If binary logging has not
previously been running on the master, then run the following
query on the slave:
@@ -8910,7 +8909,7 @@
<para>
In a more complete example scenario, we envision two replication
- channels in order to provide redundancy and thereby guard against
+ channels to provide redundancy and thereby guard against
possible failure of a single replication channel. This requires a
total of 4 replication servers, two masters for the master cluster
and two slave servers for the slave cluster. For purposes of the
@@ -9080,7 +9079,7 @@
<listitem>
<para>
- Now it is possible to synchronise the secondary channel by
+ Now it is possible to synchronize the secondary channel by
running the following query on the secondary slave server:
</para>
@@ -9094,7 +9093,7 @@
Again we have employed user variables (in this case
<literal>@file</literal> and <literal>@pos</literal>) in order
to represent the values obtained in Step 2 and applied in Step
- 3; in practise these values must be inserted manually or using
+ 3; in practice these values must be inserted manually or using
application code that can access both of the servers involved.
</para>
@@ -9247,7 +9246,7 @@
<command>ndbd</command> process for the master cluster will
have cluster backup files located on it, and
<emphasis>all</emphasis> of these files must be copied to the
- slave in order to assure a successful restore. The backup
+ slave to ensure a successful restore. The backup
files can be copied into any directory on the computer where
the slave management host resides, so long as the MySQL and
NDB binaries have read permissions in that directory. In this
@@ -9261,7 +9260,7 @@
the master; however, it is highly recommended this number be
the same. It <emphasis>is</emphasis> necessary that the slave
be started with the <option>&ddash;skip-slave-start
- option</option>, in order to prevent premature startup of
+ option</option>, to prevent premature startup of
the replication process.
</para>
</listitem>
@@ -9807,7 +9806,7 @@
table on the master cluster, if you do so using the
<command>mysqld</command> that acts as the replication master,
you must execute a <literal>SHOW TABLES</literal>, also on
- the master <command>mysqld</command>, in order to initiate
+ the master <command>mysqld</command>, to initiate
discovery properly. Otherwise, the new table and any data it
contains cannot be seen by the replication master
<command>mysqld</command>, nor by the slave (that is, neither
@@ -10127,7 +10126,7 @@
single failure can hinder more than one of them. With 32
computers and 2 switches it is possible to configure the cluster
in such a manner that no single failure can cause the loss of
- more than two nodes; in this case it is also possible to know
+ more than two nodes; in this case, it is also possible to know
which pair of nodes is affected. Thus, by placing the two nodes
in separate node groups, it is possible to build a
<quote>safe</quote> MySQL Cluster installation.
@@ -10254,12 +10253,12 @@
To ensure that SCI sockets are actually being used, you can
employ the <command>latency_bench</command> test program. Using
this utility's server component, clients can connect to the
- server in order to test the latency of the connection;
- determining whether SCI is enabled should be fairly simple from
- observing the latency. (<emphasis role="bold">Note</emphasis>:
- Before using <command>latency_bench</command>, it is necessary
- to set the <literal>LD_PRELOAD</literal> environment variable as
- shown later in this section.)
+ server to test the latency of the connection; determining
+ whether SCI is enabled should be fairly simple from observing
+ the latency. (<emphasis role="bold">Note</emphasis>: Before
+ using <command>latency_bench</command>, it is necessary to set
+ the <literal>LD_PRELOAD</literal> environment variable as shown
+ later in this section.)
</para>
<para>
@@ -10643,10 +10642,10 @@
<literal>TEXT</literal>, or <literal>VARCHAR</literal>
column, then the <literal>READ_COMMITTED</literal>
transaction isolation level is converted to a read
- with read lock. This is done in order to guarantee
- consistency, due to the fact that parts of the values
- stored in columns of these types are actually read
- from a separate table.
+ with read lock. This is done to guarantee consistency,
+ due to the fact that parts of the values stored in
+ columns of these types are actually read from a
+ separate table.
</para>
</listitem>
@@ -11388,8 +11387,8 @@
management and SQL nodes, and two computers to serve as
storage nodes. The purpose of the two data nodes is to provide
redundancy; the management node must run on a separate machine
- in order to guarantee continued arbitration services in the
- event that one of the data nodes fails.
+ to guarantee continued arbitration services in the event that
+ one of the data nodes fails.
</para>
</listitem>
@@ -11874,8 +11873,8 @@
<para>
It is possible but not advisable. One of the chief reasons to
- run a cluster is to provide redundancy; in order to enjoy the
- full benefits of this redundancy, each node should reside on a
+ run a cluster is to provide redundancy; to enjoy the full
+ benefits of this redundancy, each node should reside on a
separate machine. If you place multiple nodes on a single
machine and that machine fails, you lose all of those nodes.
Given that MySQL Cluster can be run on commodity hardware
@@ -11936,8 +11935,8 @@
<para>
In a future MySQL Cluster release series, we hope to implement
a <quote>hot</quote> reconfiguration capability for MySQL
- Cluster in order to minimize (if not eliminate) the
- requirement for restarting the cluster when adding new nodes.
+ Cluster to minimize (if not eliminate) the requirement for
+ restarting the cluster when adding new nodes.
</para>
</listitem>
@@ -12554,8 +12553,8 @@
occasionally <quote>storage nodes.</quote> In addition, SQL
nodes were sometimes known as <quote>client nodes</quote> or
<quote>API nodes.</quote> This older terminology has been
- deprecated in order to minimize confusion, and for these
- reasons should be avoided.
+ deprecated to minimize confusion, and for these reasons should
+ be avoided.
</para>
</listitem>
Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/partitioning.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1582,10 +1582,10 @@
<para>
It is also possible to define subpartitions explicitly using
- <literal>SUBPARTITION</literal> clauses in order to specify
- options for individual subpartitions. For example, a more
- verbose fashion of creating the same table <literal>ts</literal>
- as shown in the previous example would be:
+ <literal>SUBPARTITION</literal> clauses to specify options for
+ individual subpartitions. For example, a more verbose fashion of
+ creating the same table <literal>ts</literal> as shown in the
+ previous example would be:
</para>
<programlisting>
Modified: trunk/refman-5.1/porting.xml
===================================================================
--- trunk/refman-5.1/porting.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/porting.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -409,7 +409,7 @@
</itemizedlist>
<para>
- In this case you should set the following environment variable
+ In this case, you should set the following environment variable
in the shell before starting <command>gdb</command>:
</para>
@@ -723,16 +723,12 @@
</para>
<para>
- It's not a good sign if <command>mysqld</command> did die
- unexpectedly, but in this case one shouldn't investigate the
- <literal>Checking table...</literal> messages but instead try to
- find out why <command>mysqld</command> died.
+ It is not a good sign if <command>mysqld</command> did die
+ unexpectedly, but in this case, you should not investigate the
+ <literal>Checking table...</literal> messages, but instead try
+ to find out why <command>mysqld</command> died.
</para>
- <remark role="todo">
- correct the spelling of this node to "Reproducible"
- </remark>
-
</section>
<section id="reproducible-test-case">
Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/problems.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -1779,7 +1779,7 @@
</para>
<programlisting>
-MySQL Connection Failed: Can't initialize character set charset_name
+MySQL Connection Failed: Can't initialize character set <replaceable>charset_name</replaceable>
</programlisting>
<para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-26 04:11:07 UTC (rev 1041)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-26 04:14:45 UTC (rev 1042)
@@ -280,13 +280,13 @@
<literal>IGNORE</literal> is a MySQL extension to standard
SQL. It controls how <literal>ALTER TABLE</literal> works if
there are duplicates on unique keys in the new table or if
- warnings occur when <literal>STRICT</literal> mode is
- enabled. If <literal>IGNORE</literal> is not specified, the
- copy is aborted and rolled back if duplicate-key errors
- occur. If <literal>IGNORE</literal> is specified, only the
- first row is used of rows with duplicates on a unique key,
- The other conflicting rows are deleted. Incorrect values are
- truncated to the closest matching acceptable value.
+ warnings occur when strict mode is enabled. If
+ <literal>IGNORE</literal> is not specified, the copy is
+ aborted and rolled back if duplicate-key errors occur. If
+ <literal>IGNORE</literal> is specified, only the first row
+ is used of rows with duplicates on a unique key, The other
+ conflicting rows are deleted. Incorrect values are truncated
+ to the closest matching acceptable value.
</para>
</listitem>
@@ -4076,8 +4076,8 @@
</para>
<para>
- <literal>DO</literal> is useful primarily with functions that have
- side effects, such as <literal>RELEASE_LOCK()</literal>.
+ <literal>DO</literal> is useful primarily with functions that
+ have side effects, such as <literal>RELEASE_LOCK()</literal>.
</para>
<remark role="help-description-end"/>
@@ -4409,8 +4409,7 @@
If you want an <literal>INSERT</literal> statement to
generate an error unless you explicitly specify values for
all columns that do not have a default value, you should use
- <literal>STRICT</literal> mode. See
- <xref linkend="server-sql-mode"/>.
+ strict mode. See <xref linkend="server-sql-mode"/>.
</para>
</listitem>
@@ -4447,10 +4446,10 @@
</programlisting>
<para>
- In <literal>STRICT</literal> mode you will get an error if a
- column doesn't have a default value. Otherwise, MySQL will
- use the implicit default value for any column without an
- explicitly defined default.
+ In strict mode, you will get an error if a column doesn't
+ have a default value. Otherwise, MySQL will use the implicit
+ default value for any column without an explicitly defined
+ default.
</para>
</listitem>
@@ -5479,7 +5478,7 @@
<para>
If you specify <literal>REPLACE</literal>, input rows replace
existing rows (in other words, rows that have the same value for
- a primary or unique index as an existing row). See
+ a primary key or unique index as an existing row). See
<xref linkend="replace"/>.
</para>
@@ -6464,7 +6463,7 @@
<listitem>
<para>
While the insertion fails because a duplicate-key error
- occurs for a primary or unique key:
+ occurs for a primary key or unique index:
</para>
<orderedlist>
@@ -9218,7 +9217,7 @@
legal in <literal>UPDATE</literal> and
<literal>DELETE</literal> statements as well as in
<literal>SELECT</literal> statements. However, you cannot
- use the same table (in this case table
+ use the same table (in this case, table
<literal>t1</literal>) for both the subquery's
<literal>FROM</literal> clause and the update target.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1042 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 26 Jan |
