Author: paul
Date: 2006-01-25 20:42:32 +0100 (Wed, 25 Jan 2006)
New Revision: 1035
Log:
r2525@kite-hub: paul | 2006-01-25 13:42:13 -0600
Cleanup revisions.
Reformat.
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/connector-j.xml
trunk/refman-4.1/connector-mxj.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/functions.xml
trunk/refman-4.1/innodb.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/introduction.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/connector-j.xml
trunk/refman-5.0/connector-mxj.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/information-schema.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.0/problems.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/connector-j.xml
trunk/refman-5.1/connector-mxj.xml
trunk/refman-5.1/custom-engine-build.xml
trunk/refman-5.1/custom-engine.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/innodb.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/introduction.xml
trunk/refman-5.1/ndbcluster.xml
trunk/refman-5.1/partitioning.xml
trunk/refman-5.1/pluggable-storage.xml
trunk/refman-5.1/problems.xml
trunk/refman-5.1/replication.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6663
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2523
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6663
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2525
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/apis.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1821,8 +1821,8 @@
<para>
The API makes it possible for clients to respond appropriately
to statements (retrieving rows only as necessary) without
- knowing whether or not the statement is a
- <literal>SELECT</literal>. You can do this by calling
+ knowing whether the statement is a <literal>SELECT</literal>.
+ You can do this by calling
<literal>mysql_store_result()</literal> after each
<literal>mysql_query()</literal> (or
<literal>mysql_real_query()</literal>). If the result set call
@@ -5189,7 +5189,7 @@
<literal>mysql_field_count()</literal> to determine whether
<literal>mysql_store_result()</literal> should have produced a
non-empty result. This allows the client program to take
- proper action without knowing whether or not the query was a
+ proper action without knowing whether the query was a
<literal>SELECT</literal> (or <literal>SELECT</literal>-like)
statement. The example shown here illustrates how this may be
done.
@@ -5938,7 +5938,7 @@
that have a blank (empty) password field are checked for a
match. This allows the database administrator to set up
the MySQL privilege system in such a way that users get
- different privileges depending on whether or not they have
+ different privileges depending on whether they have
specified a password.
</para>
@@ -10804,9 +10804,8 @@
<para>
The use of <literal>mysql_stmt_num_rows()</literal> depends on
- whether or not you used
- <literal>mysql_stmt_store_result()</literal> to buffer the
- entire result set in the statement handle.
+ whether you used <literal>mysql_stmt_store_result()</literal>
+ to buffer the entire result set in the statement handle.
</para>
<para>
Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/connector-j.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1167,20 +1167,18 @@
<listitem>
<para>
- Unicode Character Sets — See the next section, as well as
-<xref linkend="charset"/>,
-for
- information on this new feature of MySQL. If you have
- something misconfigured, it will usually show up as an
- error with a message similar to <literal>Illegal mix of
- collations</literal>.
+ Unicode Character Sets — See the next section, as
+ well as <xref linkend="charset"/>, for information on this
+ new feature of MySQL. If you have something misconfigured,
+ it will usually show up as an error with a message similar
+ to <literal>Illegal mix of collations</literal>.
</para>
</listitem>
<listitem>
<para>
- <emphasis>Server-side Prepared Statements</emphasis> —
- Connector/J 3.1 will automatically detect and use
+ <emphasis>Server-side Prepared Statements</emphasis>
+ — Connector/J 3.1 will automatically detect and use
server-side prepared statements when they are available
(MySQL server version 4.1.0 and newer).
</para>
@@ -1213,10 +1211,10 @@
<listitem>
<para>
- Datetimes with all-zero components ('0000-00-00 ...') —
- These values can not be represented reliably in Java.
- Connector/J 3.0.x always converted them to NULL when being
- read from a ResultSet.
+ Datetimes with all-zero components ('0000-00-00 ...')
+ — These values can not be represented reliably in
+ Java. Connector/J 3.0.x always converted them to NULL when
+ being read from a ResultSet.
</para>
<para>
@@ -1777,8 +1775,9 @@
when you are unable to configure your application to
handle SQLExceptions resulting from dead andstale
connections properly. Alternatively, investigate setting
- the MySQL <literal>wait_timeout</literal> system variable to some high
- value rather than the default of 8 hours.</entry>
+ the MySQL <literal>wait_timeout</literal> system
+ variable to some high value rather than the default of 8
+ hours.</entry>
<entry>No</entry>
<entry>false</entry>
<entry>1.1</entry>
@@ -3654,15 +3653,15 @@
An application signals that it wants a transaction to be
read-only by calling
<function>Connection.setReadOnly(true)</function>, this
- <quote>replication-aware</quote> connection will use one of the slave
- connections, which are load-balanced per-vm using a round-robin
- scheme (a given connection is <quote>sticky</quote> to a slave
- unless that slave is removed from service). If you have a write
- transaction, or if you have a read that is <quote>time-sensitive</quote>
- (remember, replication in MySQL is asynchronous), set the
- connection to be not read-only, by calling
- <function>Connection.setReadOnly(false)</function> and the
- driver will ensure that further calls are sent to the
+ <quote>replication-aware</quote> connection will use one of the
+ slave connections, which are load-balanced per-vm using a
+ round-robin scheme (a given connection is <quote>sticky</quote>
+ to a slave unless that slave is removed from service). If you
+ have a write transaction, or if you have a read that is
+ <quote>time-sensitive</quote> (remember, replication in MySQL is
+ asynchronous), set the connection to be not read-only, by
+ calling <function>Connection.setReadOnly(false)</function> and
+ the driver will ensure that further calls are sent to the
<quote>master</quote> MySQL server. The driver takes care of
propagating the current state of autocommit, isolation level,
and catalog between all of the connections that it uses to
@@ -3794,12 +3793,13 @@
</para>
<para>
- When the connection is <quote>loaned out</quote> from the pool, it is used
- exclusively by the thread that requested it. From a
- programming point of view, it is the same as if your thread
- called DriverManager.getConnection() every time it needed a
- JDBC connection, however with connection pooling, your thread
- may end up using either a new, or already-existing connection.
+ When the connection is <quote>loaned out</quote> from the
+ pool, it is used exclusively by the thread that requested it.
+ From a programming point of view, it is the same as if your
+ thread called DriverManager.getConnection() every time it
+ needed a JDBC connection, however with connection pooling,
+ your thread may end up using either a new, or already-existing
+ connection.
</para>
<para>
@@ -3994,10 +3994,10 @@
code (exceptions, flow-of-control, and so forth), connections,
and anything created by them (such as statements or result
sets) are closed, so that they may be re-used, otherwise they
- will be <quote>stranded,</quote> which in the best case means that the
- MySQL server resources they represent (such as buffers, locks,
- or sockets) may be tied up for some time, or worst case, may
- be tied up forever.
+ will be <quote>stranded,</quote> which in the best case means
+ that the MySQL server resources they represent (such as
+ buffers, locks, or sockets) may be tied up for some time, or
+ worst case, may be tied up forever.
</para>
<para>
@@ -4006,13 +4006,13 @@
<para>
As with all other configuration rules-of-thumb, the answer is
- <quote>It depends.</quote> Although the optimal size depends on anticipated
- load and average database transaction time, the optimum
- connection pool size is smaller than you might expect. If you
- take Sun's Java Petstore blueprint application for example, a
- connection pool of 15-20 connections can serve a relatively
- moderate load (600 concurrent users) using MySQL and Tomcat
- with response times that are acceptable.
+ <quote>It depends.</quote> Although the optimal size depends
+ on anticipated load and average database transaction time, the
+ optimum connection pool size is smaller than you might expect.
+ If you take Sun's Java Petstore blueprint application for
+ example, a connection pool of 15-20 connections can serve a
+ relatively moderate load (600 concurrent users) using MySQL
+ and Tomcat with response times that are acceptable.
</para>
<para>
@@ -4024,11 +4024,11 @@
<para>
An easy way to determine a starting point is to configure your
connection pool's maximum number of connections to be
- <quote>unbounded,</quote> run a load test, and measure the largest amount
- of concurrently used connections. You can then work backward
- from there to determine what values of minimum and maximum
- pooled connections give the best performance for your
- particular application.
+ <quote>unbounded,</quote> run a load test, and measure the
+ largest amount of concurrently used connections. You can then
+ work backward from there to determine what values of minimum
+ and maximum pooled connections give the best performance for
+ your particular application.
</para>
</section>
@@ -4360,8 +4360,7 @@
MySQL, as Java does not support Unix Domain Sockets.
Therefore, when MySQL Connector/J connects to MySQL, the
security manager in MySQL server will use its grant tables
- to determine whether or not the connection should be
- allowed.
+ to determine whether the connection should be allowed.
</para>
<para>
@@ -4446,7 +4445,8 @@
<para>
One of two things are happening. Either the driver is not
- in your CLASSPATH or your URL format is incorrect (see the <xref linkend="cj-installing"/> section.).
+ in your CLASSPATH or your URL format is incorrect (see the
+ <xref linkend="cj-installing"/> section.).
</para>
</answer>
@@ -4731,10 +4731,10 @@
<para>
The normal place to report bugs is
- <ulink url="http://bugs.mysql.com/"/>,
- which is the address for our bugs database. This database is
- public, and can be browsed and searched by anyone. If you log in
- to the system, you will also be able to enter new reports.
+ <ulink url="http://bugs.mysql.com/"/>, which is the address for
+ our bugs database. This database is public, and can be browsed
+ and searched by anyone. If you log in to the system, you will
+ also be able to enter new reports.
</para>
<para>
Modified: trunk/refman-4.1/connector-mxj.xml
===================================================================
--- trunk/refman-4.1/connector-mxj.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/connector-mxj.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -151,8 +151,8 @@
<listitem>
<para>
MySQL Connector/J version 3.1 or newer (from
- <ulink url="&base-url-downloads;connector/j/"/>)
- installed and available via your CLASSPATH.
+ <ulink url="&base-url-downloads;connector/j/"/>) installed and
+ available via your CLASSPATH.
</para>
</listitem>
@@ -240,8 +240,8 @@
<listitem>
<para>
- To run the JUnit test suite, the $CLASSPATH must
- include the following:
+ To run the JUnit test suite, the $CLASSPATH must include the
+ following:
</para>
<itemizedlist>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/database-administration.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -481,8 +481,7 @@
For more precise control over the server SQL mode, use the
<option>--sql-mode</option> option instead. See
<xref linkend="ansi-mode"/>, and
- <xref
- linkend="server-sql-mode"/>.
+ <xref linkend="server-sql-mode"/>.
</para>
</listitem>
@@ -4814,9 +4813,8 @@
</para>
<para>
- (Windows only.) Whether or not the server allows
- shared-memory connections. This variable was added in
- MySQL 4.1.1.
+ (Windows only.) Whether the server allows shared-memory
+ connections. This variable was added in MySQL 4.1.1.
</para>
</listitem>
@@ -13415,8 +13413,8 @@
<para>
The <literal>Access denied</literal> error message tells you
who you are trying to log in as, the client host from which
- you are trying to connect, and whether or not you were using
- a password. Normally, you should have one row in the
+ you are trying to connect, and whether you were using a
+ password. Normally, you should have one row in the
<literal>user</literal> table that exactly matches the
hostname and username that were given in the error message.
For example, if you get an error message that contains
@@ -21903,7 +21901,7 @@
<para>
This section describes how the query cache works when it is
operational. <xref linkend="query-cache-configuration"/>,
- describes how to control whether or not it is operational.
+ describes how to control whether it is operational.
</para>
<para>
@@ -21962,7 +21960,7 @@
(it does not return results). Beginning with MySQL 4.1.1, the
query cache also works within transactions when using
<literal>InnoDB</literal> tables (it uses the table version
- number to detect whether or not its contents are still current).
+ number to detect whether its contents are still current).
</para>
<para>
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/functions.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -789,8 +789,7 @@
<replaceable>max</replaceable>)</literal> if all the
arguments are of the same type. Otherwise type conversion
takes place according to the rules described in
- <xref
-linkend="type-conversion"/>, but applied to all the
+ <xref linkend="type-conversion"/>, but applied to all the
three arguments. <emphasis role="bold">Note</emphasis>:
Before MySQL 4.0.5, arguments were converted to the type of
<replaceable>expr</replaceable> instead.
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/innodb.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1016,7 +1016,7 @@
on the command line or as
<literal><replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
in option files. Many of the system variables can be changed at
- runtime (see xref linkend="dynamic-system-variables"/>). (Before
+ runtime (see <xref linkend="dynamic-system-variables"/>). (Before
MySQL 4.0.2, system variable values should be specified using
<option>--set-variable</option> syntax.) For more information on
specifying options and system variables, see
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/installing.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -124,7 +124,7 @@
<listitem>
<para>
- Determine whether or not MySQL runs on your platform.
+ Determine whether MySQL runs on your platform.
</para>
</listitem>
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/introduction.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -2146,12 +2146,12 @@
<listitem>
<para>
- To be safe with MySQL Server, whether or not you use
- transactional tables, you only need to have backups and
- have binary logging turned on. When that is true, you can
- recover from any situation that you could with any other
- transactional database system. It is always good to have
- backups, regardless of which database system you use.
+ To be safe with MySQL Server, regardless of whether you
+ use transactional tables, you only need to have backups
+ and have binary logging turned on. When that is true, you
+ can recover from any situation that you could with any
+ other transactional database system. It is always good to
+ have backups, regardless of which database system you use.
</para>
</listitem>
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/ndbcluster.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -848,7 +848,7 @@
Check your <filename>/etc/passwd</filename> and
<filename>/etc/group</filename> files (or use whatever tools
are provided by your operating system for manging users and
- groups) to see whether or not there are already a
+ groups) to see whether there is already a
<literal>mysql</literal> group and <literal>mysql</literal>
user on the system, as some OS distributions create these as
part of the operating system installation process. If these
@@ -2871,10 +2871,10 @@
</para>
<para>
- If no node IDs are provided then the order of the data
- nodes will be the determining factor for the node group.
- Whether or not explicit assignments are made, they can be
- viewed in the output of the management client's
+ If no node IDs are provided, the order of the data nodes
+ will be the determining factor for the node group. Whether
+ or not explicit assignments are made, they can be viewed
+ in the output of the management client's
<literal>SHOW</literal> command.
</para>
@@ -8673,12 +8673,11 @@
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 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 necessary to set the
- <literal>LD_PRELOAD</literal> environment variable as shown
- later in this section.)
+ 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>
@@ -9800,9 +9799,9 @@
<para>
Cluster is supported in the MySQL-max binaries from version
- 4.1.3 onward. You can determine whether or not your server
- binary has <literal>NDB</literal> support using either of the
- commands <literal>SHOW VARIABLES LIKE 'have_%';</literal> or
+ 4.1.3 onward. You can determine whether your server binary has
+ <literal>NDB</literal> support using either of the commands
+ <literal>SHOW VARIABLES LIKE 'have_%';</literal> or
<literal>SHOW ENGINES;</literal>. (See
<xref linkend="mysqld-max"/>, for more information.)
</para>
Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/problems.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1147,7 +1147,7 @@
<listitem>
<para>
- Indicate whether or not the MySQL server died. You can find
+ Indicate whether the MySQL server died. You can find
information about this in the server error log. See
<xref linkend="crashing"/>.
</para>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/replication.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -2760,7 +2760,7 @@
The main reason for this
<quote>check-just-the-default-database</quote> behavior is
that it's difficult from the statement alone to know whether
- or not it should be replicated (for example, if you are using
+ it should be replicated (for example, if you are using
multiple-table <literal>DELETE</literal> or multiple-table
<literal>UPDATE</literal> statements that go across multiple
databases). It is also faster to check only the default
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-4.1/sql-syntax.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1330,8 +1330,8 @@
<para>
In MySQL 3.22 or later, the table name can be specified as
<replaceable>db_name.tbl_name</replaceable> to create the table
- in a specific database. This works whether or not there is a
- default database. If you use quoted identifiers, quote the
+ in a specific database. This works regardless of whether there
+ is a default database. If you use quoted identifiers, quote the
database and table names separately. For example,
<literal>`mydb`.`mytbl`</literal> is legal, but
<literal>`mydb.mytbl`</literal> is not.
@@ -4967,13 +4967,13 @@
If you specify <literal>IGNORE</literal>, input rows that
duplicate an existing row on a unique key value are skipped. If
you do not specify either option, the behavior depends on
- whether or not the <literal>LOCAL</literal> keyword is
- specified. Without <literal>LOCAL</literal>, an error occurs
- when a duplicate key value is found, and the rest of the text
- file is ignored. With <literal>LOCAL</literal>, the default
- behavior is the same as if <literal>IGNORE</literal> is
- specified; this is because the server has no way to stop
- transmission of the file in the middle of the operation.
+ whether the <literal>LOCAL</literal> keyword is specified.
+ Without <literal>LOCAL</literal>, an error occurs when a
+ duplicate key value is found, and the rest of the text file is
+ ignored. With <literal>LOCAL</literal>, the default behavior is
+ the same as if <literal>IGNORE</literal> is specified; this is
+ because the server has no way to stop transmission of the file
+ in the middle of the operation.
</para>
<para>
@@ -17633,7 +17633,7 @@
</para>
<para>
- Whether or not the SQL thread is started.
+ Whether the SQL thread is started.
</para>
</listitem>
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/apis.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1869,8 +1869,8 @@
<para>
The API makes it possible for clients to respond appropriately
to statements (retrieving rows only as necessary) without
- knowing whether or not the statement is a
- <literal>SELECT</literal>. You can do this by calling
+ knowing whether the statement is a <literal>SELECT</literal>.
+ You can do this by calling
<literal>mysql_store_result()</literal> after each
<literal>mysql_query()</literal> (or
<literal>mysql_real_query()</literal>). If the result set call
@@ -5232,7 +5232,7 @@
<literal>mysql_field_count()</literal> to determine whether
<literal>mysql_store_result()</literal> should have produced a
non-empty result. This allows the client program to take
- proper action without knowing whether or not the query was a
+ proper action without knowing whether the query was a
<literal>SELECT</literal> (or <literal>SELECT</literal>-like)
statement. The example shown here illustrates how this may be
done.
@@ -5985,7 +5985,7 @@
that have a blank (empty) password field are checked for a
match. This allows the database administrator to set up
the MySQL privilege system in such a way that users get
- different privileges depending on whether or not they have
+ different privileges depending on whether they have
specified a password.
</para>
@@ -10824,9 +10824,8 @@
<para>
The use of <literal>mysql_stmt_num_rows()</literal> depends on
- whether or not you used
- <literal>mysql_stmt_store_result()</literal> to buffer the
- entire result set in the statement handle.
+ whether you used <literal>mysql_stmt_store_result()</literal>
+ to buffer the entire result set in the statement handle.
</para>
<para>
Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/connector-j.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1167,20 +1167,18 @@
<listitem>
<para>
- Unicode Character Sets — See the next section, as well as
-<xref linkend="charset"/>,
-for
- information on this new feature of MySQL. If you have
- something misconfigured, it will usually show up as an
- error with a message similar to <literal>Illegal mix of
- collations</literal>.
+ Unicode Character Sets — See the next section, as
+ well as <xref linkend="charset"/>, for information on this
+ new feature of MySQL. If you have something misconfigured,
+ it will usually show up as an error with a message similar
+ to <literal>Illegal mix of collations</literal>.
</para>
</listitem>
<listitem>
<para>
- <emphasis>Server-side Prepared Statements</emphasis> —
- Connector/J 3.1 will automatically detect and use
+ <emphasis>Server-side Prepared Statements</emphasis>
+ — Connector/J 3.1 will automatically detect and use
server-side prepared statements when they are available
(MySQL server version 4.1.0 and newer).
</para>
@@ -1213,10 +1211,10 @@
<listitem>
<para>
- Datetimes with all-zero components ('0000-00-00 ...') —
- These values can not be represented reliably in Java.
- Connector/J 3.0.x always converted them to NULL when being
- read from a ResultSet.
+ Datetimes with all-zero components ('0000-00-00 ...')
+ — These values can not be represented reliably in
+ Java. Connector/J 3.0.x always converted them to NULL when
+ being read from a ResultSet.
</para>
<para>
@@ -1777,8 +1775,9 @@
when you are unable to configure your application to
handle SQLExceptions resulting from dead andstale
connections properly. Alternatively, investigate setting
- the MySQL <literal>wait_timeout</literal> system variable to some high
- value rather than the default of 8 hours.</entry>
+ the MySQL <literal>wait_timeout</literal> system
+ variable to some high value rather than the default of 8
+ hours.</entry>
<entry>No</entry>
<entry>false</entry>
<entry>1.1</entry>
@@ -3654,15 +3653,15 @@
An application signals that it wants a transaction to be
read-only by calling
<function>Connection.setReadOnly(true)</function>, this
- <quote>replication-aware</quote> connection will use one of the slave
- connections, which are load-balanced per-vm using a round-robin
- scheme (a given connection is <quote>sticky</quote> to a slave
- unless that slave is removed from service). If you have a write
- transaction, or if you have a read that is <quote>time-sensitive</quote>
- (remember, replication in MySQL is asynchronous), set the
- connection to be not read-only, by calling
- <function>Connection.setReadOnly(false)</function> and the
- driver will ensure that further calls are sent to the
+ <quote>replication-aware</quote> connection will use one of the
+ slave connections, which are load-balanced per-vm using a
+ round-robin scheme (a given connection is <quote>sticky</quote>
+ to a slave unless that slave is removed from service). If you
+ have a write transaction, or if you have a read that is
+ <quote>time-sensitive</quote> (remember, replication in MySQL is
+ asynchronous), set the connection to be not read-only, by
+ calling <function>Connection.setReadOnly(false)</function> and
+ the driver will ensure that further calls are sent to the
<quote>master</quote> MySQL server. The driver takes care of
propagating the current state of autocommit, isolation level,
and catalog between all of the connections that it uses to
@@ -3794,12 +3793,13 @@
</para>
<para>
- When the connection is <quote>loaned out</quote> from the pool, it is used
- exclusively by the thread that requested it. From a
- programming point of view, it is the same as if your thread
- called DriverManager.getConnection() every time it needed a
- JDBC connection, however with connection pooling, your thread
- may end up using either a new, or already-existing connection.
+ When the connection is <quote>loaned out</quote> from the
+ pool, it is used exclusively by the thread that requested it.
+ From a programming point of view, it is the same as if your
+ thread called DriverManager.getConnection() every time it
+ needed a JDBC connection, however with connection pooling,
+ your thread may end up using either a new, or already-existing
+ connection.
</para>
<para>
@@ -3994,10 +3994,10 @@
code (exceptions, flow-of-control, and so forth), connections,
and anything created by them (such as statements or result
sets) are closed, so that they may be re-used, otherwise they
- will be <quote>stranded,</quote> which in the best case means that the
- MySQL server resources they represent (such as buffers, locks,
- or sockets) may be tied up for some time, or worst case, may
- be tied up forever.
+ will be <quote>stranded,</quote> which in the best case means
+ that the MySQL server resources they represent (such as
+ buffers, locks, or sockets) may be tied up for some time, or
+ worst case, may be tied up forever.
</para>
<para>
@@ -4006,13 +4006,13 @@
<para>
As with all other configuration rules-of-thumb, the answer is
- <quote>It depends.</quote> Although the optimal size depends on anticipated
- load and average database transaction time, the optimum
- connection pool size is smaller than you might expect. If you
- take Sun's Java Petstore blueprint application for example, a
- connection pool of 15-20 connections can serve a relatively
- moderate load (600 concurrent users) using MySQL and Tomcat
- with response times that are acceptable.
+ <quote>It depends.</quote> Although the optimal size depends
+ on anticipated load and average database transaction time, the
+ optimum connection pool size is smaller than you might expect.
+ If you take Sun's Java Petstore blueprint application for
+ example, a connection pool of 15-20 connections can serve a
+ relatively moderate load (600 concurrent users) using MySQL
+ and Tomcat with response times that are acceptable.
</para>
<para>
@@ -4024,11 +4024,11 @@
<para>
An easy way to determine a starting point is to configure your
connection pool's maximum number of connections to be
- <quote>unbounded,</quote> run a load test, and measure the largest amount
- of concurrently used connections. You can then work backward
- from there to determine what values of minimum and maximum
- pooled connections give the best performance for your
- particular application.
+ <quote>unbounded,</quote> run a load test, and measure the
+ largest amount of concurrently used connections. You can then
+ work backward from there to determine what values of minimum
+ and maximum pooled connections give the best performance for
+ your particular application.
</para>
</section>
@@ -4360,8 +4360,7 @@
MySQL, as Java does not support Unix Domain Sockets.
Therefore, when MySQL Connector/J connects to MySQL, the
security manager in MySQL server will use its grant tables
- to determine whether or not the connection should be
- allowed.
+ to determine whether the connection should be allowed.
</para>
<para>
@@ -4446,7 +4445,8 @@
<para>
One of two things are happening. Either the driver is not
- in your CLASSPATH or your URL format is incorrect (see the <xref linkend="cj-installing"/> section.).
+ in your CLASSPATH or your URL format is incorrect (see the
+ <xref linkend="cj-installing"/> section.).
</para>
</answer>
@@ -4731,10 +4731,10 @@
<para>
The normal place to report bugs is
- <ulink url="http://bugs.mysql.com/"/>,
- which is the address for our bugs database. This database is
- public, and can be browsed and searched by anyone. If you log in
- to the system, you will also be able to enter new reports.
+ <ulink url="http://bugs.mysql.com/"/>, which is the address for
+ our bugs database. This database is public, and can be browsed
+ and searched by anyone. If you log in to the system, you will
+ also be able to enter new reports.
</para>
<para>
Modified: trunk/refman-5.0/connector-mxj.xml
===================================================================
--- trunk/refman-5.0/connector-mxj.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/connector-mxj.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -151,8 +151,8 @@
<listitem>
<para>
MySQL Connector/J version 3.1 or newer (from
- <ulink url="&base-url-downloads;connector/j/"/>)
- installed and available via your CLASSPATH.
+ <ulink url="&base-url-downloads;connector/j/"/>) installed and
+ available via your CLASSPATH.
</para>
</listitem>
@@ -240,8 +240,8 @@
<listitem>
<para>
- To run the JUnit test suite, the $CLASSPATH must
- include the following:
+ To run the JUnit test suite, the $CLASSPATH must include the
+ following:
</para>
<itemizedlist>
@@ -438,13 +438,13 @@
<title>Running within a Java Object</title>
<para>
- Have a java application and wish to <quote>embed</quote> a MySQL database, make
- use of the com.mysql.management.MysqldResource class directly.
- This class may be instantiated with the default (no argument)
- constructor, or by passing in a java.io.File object representing
- the directory you wish the server to be "unzipped" into. It may
- also be instantiated with printstreams for "stdout" and "stderr"
- for logging.
+ Have a java application and wish to <quote>embed</quote> a MySQL
+ database, make use of the com.mysql.management.MysqldResource
+ class directly. This class may be instantiated with the default
+ (no argument) constructor, or by passing in a java.io.File object
+ representing the directory you wish the server to be "unzipped"
+ into. It may also be instantiated with printstreams for "stdout"
+ and "stderr" for logging.
</para>
<para>
@@ -613,10 +613,10 @@
</para>
<para>
- The default <quote>Kill Delay</quote> is 30 seconds. This represents the
- amount of time to wait between the initial request to shutdown
- and issuing a <quote>force kill</quote> if the database has not shutdown by
- itself.
+ The default <quote>Kill Delay</quote> is 30 seconds. This
+ represents the amount of time to wait between the initial
+ request to shutdown and issuing a <quote>force kill</quote> if
+ the database has not shutdown by itself.
</para>
</listitem>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/database-administration.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -498,8 +498,7 @@
For more precise control over the server SQL mode, use the
<option>--sql-mode</option> option instead. See
<xref linkend="ansi-mode"/>, and
- <xref
-linkend="server-sql-mode"/>.
+ <xref linkend="server-sql-mode"/>.
</para>
</listitem>
@@ -5127,8 +5126,8 @@
</para>
<para>
- (Windows only.) Whether or not the server allows
- shared-memory connections.
+ (Windows only.) Whether the server allows shared-memory
+ connections.
</para>
</listitem>
@@ -15584,8 +15583,8 @@
<para>
The <literal>Access denied</literal> error message tells you
who you are trying to log in as, the client host from which
- you are trying to connect, and whether or not you were using
- a password. Normally, you should have one row in the
+ you are trying to connect, and whether you were using a
+ password. Normally, you should have one row in the
<literal>user</literal> table that exactly matches the
hostname and username that were given in the error message.
For example, if you get an error message that contains
@@ -23960,7 +23959,7 @@
<para>
This section describes how the query cache works when it is
operational. <xref linkend="query-cache-configuration"/>,
- describes how to control whether or not it is operational.
+ describes how to control whether it is operational.
</para>
<para>
@@ -24017,8 +24016,7 @@
<para>
The query cache also works within transactions when using
<literal>InnoDB</literal> tables, making use of the table
- version number to detect whether or not its contents are still
- current.
+ version number to detect whether its contents are still current.
</para>
<para>
Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/information-schema.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -3273,8 +3273,7 @@
server SQL mode</emphasis>). The possible range of values
for this column is the same as that of the
<literal>sql_mode</literal> system variable. See
- <xref
- linkend="server-sql-mode"/>.
+ <xref linkend="server-sql-mode"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/innodb.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -911,8 +911,8 @@
<literal><replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
in option files. For more information on specifying options and
system variables, see <xref linkend="program-options"/>. Many of
- the system variables can be changed at runtime (see xref
- linkend="dynamic-system-variables"/>).
+ the system variables can be changed at runtime (see
+ <xref linkend="dynamic-system-variables"/>).
</para>
<para>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/installing.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -124,7 +124,7 @@
<listitem>
<para>
- Determine whether or not MySQL runs on your platform.
+ Determine whether MySQL runs on your platform.
</para>
</listitem>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/introduction.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1770,12 +1770,12 @@
<listitem>
<para>
- To be safe with MySQL Server, whether or not you use
- transactional tables, you only need to have backups and
- have binary logging turned on. When that is true, you can
- recover from any situation that you could with any other
- transactional database system. It is always good to have
- backups, regardless of which database system you use.
+ To be safe with MySQL Server, regardless of whether you
+ use transactional tables, you only need to have backups
+ and have binary logging turned on. When that is true, you
+ can recover from any situation that you could with any
+ other transactional database system. It is always good to
+ have backups, regardless of which database system you use.
</para>
</listitem>
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/ndbcluster.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -202,10 +202,10 @@
<para>
<emphasis role="bold">Note</emphasis>: In many contexts, the term
- <quote>node</quote> is used to indicate a computer, but when discussing MySQL
- Cluster it means a <emphasis>process</emphasis>. There can be any
- number of nodes on a single computer, for which we use the term
- <emphasis role="bold">cluster host</emphasis>.
+ <quote>node</quote> is used to indicate a computer, but when
+ discussing MySQL Cluster it means a <emphasis>process</emphasis>.
+ There can be any number of nodes on a single computer, for which
+ we use the term <emphasis role="bold">cluster host</emphasis>.
</para>
<para>
@@ -847,7 +847,7 @@
Check your <filename>/etc/passwd</filename> and
<filename>/etc/group</filename> files (or use whatever tools
are provided by your operating system for manging users and
- groups) to see whether or not there are already a
+ groups) to see whether there is already a
<literal>mysql</literal> group and <literal>mysql</literal>
user on the system, as some OS distributions create these as
part of the operating system installation process. If these
@@ -2861,10 +2861,10 @@
</para>
<para>
- If no node IDs are provided then the order of the data
- nodes will be the determining factor for the node group.
- Whether or not explicit assignments are made, they can be
- viewed in the output of the management client's
+ If no node IDs are provided, the order of the data nodes
+ will be the determining factor for the node group. Whether
+ or not explicit assignments are made, they can be viewed
+ in the output of the management client's
<literal>SHOW</literal> command.
</para>
@@ -4550,9 +4550,9 @@
All update activities also need to be logged. This log
makes it possible to replay these updates whenever the
system is restarted. The NDB recovery algorithm uses a
- <quote>fuzzy</quote> checkpoint of the data together with the UNDO log,
- and then applies the REDO log to play back all changes up
- to the restoration point.
+ <quote>fuzzy</quote> checkpoint of the data together with
+ the UNDO log, and then applies the REDO log to play back
+ all changes up to the restoration point.
</para>
<para>
@@ -8645,12 +8645,11 @@
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 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 necessary to set the
- <literal>LD_PRELOAD</literal> environment variable as shown
- later in this section.)
+ 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>
@@ -10077,11 +10076,11 @@
<para>
Cluster is supported in all MySQL-max binaries in the
¤t-series; release series, except as noted in the
- following paragraph. You can determine whether or not your
- server has NDB support using either of the commands
- <literal>SHOW VARIABLES LIKE 'have_%';</literal> or
- <literal>SHOW ENGINES;</literal>. (See
- <xref linkend="mysqld-max"/>, for more information.)
+ following paragraph. You can determine whether your server has
+ NDB support using either of the commands <literal>SHOW
+ VARIABLES LIKE 'have_%';</literal> or <literal>SHOW
+ ENGINES;</literal>. (See <xref linkend="mysqld-max"/>, for
+ more information.)
</para>
<para>
Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/problems.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1147,7 +1147,7 @@
<listitem>
<para>
- Indicate whether or not the MySQL server died. You can find
+ Indicate whether the MySQL server died. You can find
information about this in the server error log. See
<xref linkend="crashing"/>.
</para>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/replication.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -2635,8 +2635,8 @@
<para>
The main reason for this <quote>just check the default
database</quote> behavior is that it is difficult from the
- statement alone to know whether or not it should be replicated
- (for example, if you are using multiple-table
+ statement alone to know whether it should be replicated (for
+ example, if you are using multiple-table
<literal>DELETE</literal> statements or multiple-table
<literal>UPDATE</literal> statements that act across multiple
databases). It is also faster to check only the default
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1371,8 +1371,8 @@
<para>
The table name can be specified as
<replaceable>db_name.tbl_name</replaceable> to create the table
- in a specific database. This works whether or not there is a
- default database. If you use quoted identifiers, quote the
+ in a specific database. This works regardless of whether there
+ is a default database. If you use quoted identifiers, quote the
database and table names separately. For example,
<literal>`mydb`.`mytbl`</literal> is legal, but
<literal>`mydb.mytbl`</literal> is not.
@@ -4889,13 +4889,13 @@
If you specify <literal>IGNORE</literal>, input rows that
duplicate an existing row on a unique key value are skipped. If
you do not specify either option, the behavior depends on
- whether or not the <literal>LOCAL</literal> keyword is
- specified. Without <literal>LOCAL</literal>, an error occurs
- when a duplicate key value is found, and the rest of the text
- file is ignored. With <literal>LOCAL</literal>, the default
- behavior is the same as if <literal>IGNORE</literal> is
- specified; this is because the server has no way to stop
- transmission of the file in the middle of the operation.
+ whether the <literal>LOCAL</literal> keyword is specified.
+ Without <literal>LOCAL</literal>, an error occurs when a
+ duplicate key value is found, and the rest of the text file is
+ ignored. With <literal>LOCAL</literal>, the default behavior is
+ the same as if <literal>IGNORE</literal> is specified; this is
+ because the server has no way to stop transmission of the file
+ in the middle of the operation.
</para>
<para>
@@ -19076,7 +19076,7 @@
</para>
<para>
- Whether or not the SQL thread is started.
+ Whether the SQL thread is started.
</para>
</listitem>
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/apis.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1867,8 +1867,8 @@
<para>
The API makes it possible for clients to respond appropriately
to statements (retrieving rows only as necessary) without
- knowing whether or not the statement is a
- <literal>SELECT</literal>. You can do this by calling
+ knowing whether the statement is a <literal>SELECT</literal>.
+ You can do this by calling
<literal>mysql_store_result()</literal> after each
<literal>mysql_query()</literal> (or
<literal>mysql_real_query()</literal>). If the result set call
@@ -5228,7 +5228,7 @@
<literal>mysql_field_count()</literal> to determine whether
<literal>mysql_store_result()</literal> should have produced a
non-empty result. This allows the client program to take
- proper action without knowing whether or not the query was a
+ proper action without knowing whether the query was a
<literal>SELECT</literal> (or <literal>SELECT</literal>-like)
statement. The example shown here illustrates how this may be
done.
@@ -5985,7 +5985,7 @@
that have a blank (empty) password field are checked for a
match. This allows the database administrator to set up
the MySQL privilege system in such a way that users get
- different privileges depending on whether or not they have
+ different privileges depending on whether they have
specified a password.
</para>
@@ -10829,9 +10829,8 @@
<para>
The use of <literal>mysql_stmt_num_rows()</literal> depends on
- whether or not you used
- <literal>mysql_stmt_store_result()</literal> to buffer the
- entire result set in the statement handle.
+ whether you used <literal>mysql_stmt_store_result()</literal>
+ to buffer the entire result set in the statement handle.
</para>
<para>
Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/connector-j.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1167,20 +1167,18 @@
<listitem>
<para>
- Unicode Character Sets — See the next section, as well as
-<xref linkend="charset"/>,
-for
- information on this new feature of MySQL. If you have
- something misconfigured, it will usually show up as an
- error with a message similar to <literal>Illegal mix of
- collations</literal>.
+ Unicode Character Sets — See the next section, as
+ well as <xref linkend="charset"/>, for information on this
+ new feature of MySQL. If you have something misconfigured,
+ it will usually show up as an error with a message similar
+ to <literal>Illegal mix of collations</literal>.
</para>
</listitem>
<listitem>
<para>
- <emphasis>Server-side Prepared Statements</emphasis> —
- Connector/J 3.1 will automatically detect and use
+ <emphasis>Server-side Prepared Statements</emphasis>
+ — Connector/J 3.1 will automatically detect and use
server-side prepared statements when they are available
(MySQL server version 4.1.0 and newer).
</para>
@@ -1213,10 +1211,10 @@
<listitem>
<para>
- Datetimes with all-zero components ('0000-00-00 ...') —
- These values can not be represented reliably in Java.
- Connector/J 3.0.x always converted them to NULL when being
- read from a ResultSet.
+ Datetimes with all-zero components ('0000-00-00 ...')
+ — These values can not be represented reliably in
+ Java. Connector/J 3.0.x always converted them to NULL when
+ being read from a ResultSet.
</para>
<para>
@@ -1777,8 +1775,9 @@
when you are unable to configure your application to
handle SQLExceptions resulting from dead andstale
connections properly. Alternatively, investigate setting
- the MySQL <literal>wait_timeout</literal> system variable to some high
- value rather than the default of 8 hours.</entry>
+ the MySQL <literal>wait_timeout</literal> system
+ variable to some high value rather than the default of 8
+ hours.</entry>
<entry>No</entry>
<entry>false</entry>
<entry>1.1</entry>
@@ -3654,15 +3653,15 @@
An application signals that it wants a transaction to be
read-only by calling
<function>Connection.setReadOnly(true)</function>, this
- <quote>replication-aware</quote> connection will use one of the slave
- connections, which are load-balanced per-vm using a round-robin
- scheme (a given connection is <quote>sticky</quote> to a slave
- unless that slave is removed from service). If you have a write
- transaction, or if you have a read that is <quote>time-sensitive</quote>
- (remember, replication in MySQL is asynchronous), set the
- connection to be not read-only, by calling
- <function>Connection.setReadOnly(false)</function> and the
- driver will ensure that further calls are sent to the
+ <quote>replication-aware</quote> connection will use one of the
+ slave connections, which are load-balanced per-vm using a
+ round-robin scheme (a given connection is <quote>sticky</quote>
+ to a slave unless that slave is removed from service). If you
+ have a write transaction, or if you have a read that is
+ <quote>time-sensitive</quote> (remember, replication in MySQL is
+ asynchronous), set the connection to be not read-only, by
+ calling <function>Connection.setReadOnly(false)</function> and
+ the driver will ensure that further calls are sent to the
<quote>master</quote> MySQL server. The driver takes care of
propagating the current state of autocommit, isolation level,
and catalog between all of the connections that it uses to
@@ -3794,12 +3793,13 @@
</para>
<para>
- When the connection is <quote>loaned out</quote> from the pool, it is used
- exclusively by the thread that requested it. From a
- programming point of view, it is the same as if your thread
- called DriverManager.getConnection() every time it needed a
- JDBC connection, however with connection pooling, your thread
- may end up using either a new, or already-existing connection.
+ When the connection is <quote>loaned out</quote> from the
+ pool, it is used exclusively by the thread that requested it.
+ From a programming point of view, it is the same as if your
+ thread called DriverManager.getConnection() every time it
+ needed a JDBC connection, however with connection pooling,
+ your thread may end up using either a new, or already-existing
+ connection.
</para>
<para>
@@ -3994,10 +3994,10 @@
code (exceptions, flow-of-control, and so forth), connections,
and anything created by them (such as statements or result
sets) are closed, so that they may be re-used, otherwise they
- will be <quote>stranded,</quote> which in the best case means that the
- MySQL server resources they represent (such as buffers, locks,
- or sockets) may be tied up for some time, or worst case, may
- be tied up forever.
+ will be <quote>stranded,</quote> which in the best case means
+ that the MySQL server resources they represent (such as
+ buffers, locks, or sockets) may be tied up for some time, or
+ worst case, may be tied up forever.
</para>
<para>
@@ -4006,13 +4006,13 @@
<para>
As with all other configuration rules-of-thumb, the answer is
- <quote>It depends.</quote> Although the optimal size depends on anticipated
- load and average database transaction time, the optimum
- connection pool size is smaller than you might expect. If you
- take Sun's Java Petstore blueprint application for example, a
- connection pool of 15-20 connections can serve a relatively
- moderate load (600 concurrent users) using MySQL and Tomcat
- with response times that are acceptable.
+ <quote>It depends.</quote> Although the optimal size depends
+ on anticipated load and average database transaction time, the
+ optimum connection pool size is smaller than you might expect.
+ If you take Sun's Java Petstore blueprint application for
+ example, a connection pool of 15-20 connections can serve a
+ relatively moderate load (600 concurrent users) using MySQL
+ and Tomcat with response times that are acceptable.
</para>
<para>
@@ -4024,11 +4024,11 @@
<para>
An easy way to determine a starting point is to configure your
connection pool's maximum number of connections to be
- <quote>unbounded,</quote> run a load test, and measure the largest amount
- of concurrently used connections. You can then work backward
- from there to determine what values of minimum and maximum
- pooled connections give the best performance for your
- particular application.
+ <quote>unbounded,</quote> run a load test, and measure the
+ largest amount of concurrently used connections. You can then
+ work backward from there to determine what values of minimum
+ and maximum pooled connections give the best performance for
+ your particular application.
</para>
</section>
@@ -4360,8 +4360,7 @@
MySQL, as Java does not support Unix Domain Sockets.
Therefore, when MySQL Connector/J connects to MySQL, the
security manager in MySQL server will use its grant tables
- to determine whether or not the connection should be
- allowed.
+ to determine whether the connection should be allowed.
</para>
<para>
@@ -4446,7 +4445,8 @@
<para>
One of two things are happening. Either the driver is not
- in your CLASSPATH or your URL format is incorrect (see the <xref linkend="cj-installing"/> section.).
+ in your CLASSPATH or your URL format is incorrect (see the
+ <xref linkend="cj-installing"/> section.).
</para>
</answer>
@@ -4731,10 +4731,10 @@
<para>
The normal place to report bugs is
- <ulink url="http://bugs.mysql.com/"/>,
- which is the address for our bugs database. This database is
- public, and can be browsed and searched by anyone. If you log in
- to the system, you will also be able to enter new reports.
+ <ulink url="http://bugs.mysql.com/"/>, which is the address for
+ our bugs database. This database is public, and can be browsed
+ and searched by anyone. If you log in to the system, you will
+ also be able to enter new reports.
</para>
<para>
Modified: trunk/refman-5.1/connector-mxj.xml
===================================================================
--- trunk/refman-5.1/connector-mxj.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/connector-mxj.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -151,8 +151,8 @@
<listitem>
<para>
MySQL Connector/J version 3.1 or newer (from
- <ulink url="&base-url-downloads;connector/j/"/>)
- installed and available via your CLASSPATH.
+ <ulink url="&base-url-downloads;connector/j/"/>) installed and
+ available via your CLASSPATH.
</para>
</listitem>
@@ -240,8 +240,8 @@
<listitem>
<para>
- To run the JUnit test suite, the $CLASSPATH must
- include the following:
+ To run the JUnit test suite, the $CLASSPATH must include the
+ following:
</para>
<itemizedlist>
@@ -438,13 +438,13 @@
<title>Running within a Java Object</title>
<para>
- Have a java application and wish to <quote>embed</quote> a MySQL database, make
- use of the com.mysql.management.MysqldResource class directly.
- This class may be instantiated with the default (no argument)
- constructor, or by passing in a java.io.File object representing
- the directory you wish the server to be "unzipped" into. It may
- also be instantiated with printstreams for "stdout" and "stderr"
- for logging.
+ Have a java application and wish to <quote>embed</quote> a MySQL
+ database, make use of the com.mysql.management.MysqldResource
+ class directly. This class may be instantiated with the default
+ (no argument) constructor, or by passing in a java.io.File object
+ representing the directory you wish the server to be "unzipped"
+ into. It may also be instantiated with printstreams for "stdout"
+ and "stderr" for logging.
</para>
<para>
@@ -613,10 +613,10 @@
</para>
<para>
- The default <quote>Kill Delay</quote> is 30 seconds. This represents the
- amount of time to wait between the initial request to shutdown
- and issuing a <quote>force kill</quote> if the database has not shutdown by
- itself.
+ The default <quote>Kill Delay</quote> is 30 seconds. This
+ represents the amount of time to wait between the initial
+ request to shutdown and issuing a <quote>force kill</quote> if
+ the database has not shutdown by itself.
</para>
</listitem>
Modified: trunk/refman-5.1/custom-engine-build.xml
===================================================================
--- trunk/refman-5.1/custom-engine-build.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/custom-engine-build.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1,53 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<section id="custom-engine-build">
- <title>Building and Testing Pluggable Storage Engines</title>
+ <title>Building and Testing Pluggable Storage Engines</title>
- <para>
- With MySQL 5.1 it is possible to build storage engines as shared
- objects that can be loaded dynamically into a running MySQL
- server. This new approach makes it easier to deploy custom
- storage engines because it is no longer necessary to re-compile
- the MySQL server to install or upgrade a storage engine.
- </para>
+ <para>
+ With MySQL 5.1 it is possible to build storage engines as shared
+ objects that can be loaded dynamically into a running MySQL server.
+ This new approach makes it easier to deploy custom storage engines
+ because it is no longer necessary to re-compile the MySQL server to
+ install or upgrade a storage engine.
+ </para>
- <para>
- Building and testing a pluggable storage engine requires some
- modifications to be made to your storage engine source files,
- along with the creation of a specialized Makefile.
- </para>
+ <para>
+ Building and testing a pluggable storage engine requires some
+ modifications to be made to your storage engine source files, along
+ with the creation of a specialized Makefile.
+ </para>
- <section id="custom-engine-build-source">
+ <section id="custom-engine-build-source">
- <title>Source Modifications Required to Build a Pluggable Storage Engine</title>
+ <title>Source Modifications Required to Build a Pluggable Storage Engine</title>
- <para>
- When building a pluggable storage engine, avoid using symbol
- names that already exist in the <literal>mysqld</literal>
- source code. This can be as simple as prepending all symbol
- names with the name of your storage engine.
- </para>
+ <para>
+ When building a pluggable storage engine, avoid using symbol names
+ that already exist in the <literal>mysqld</literal> source code.
+ This can be as simple as prepending all symbol names with the name
+ of your storage engine.
+ </para>
- <para>
- The following line must be added to the start of your
- <filename><replaceable>storage-engine</replaceable>.cc</filename>
- file:
- </para>
+ <para>
+ The following line must be added to the start of your
+ <filename><replaceable>storage-engine</replaceable>.cc</filename>
+ file:
+ </para>
<programlisting>
#include <plugins.h>
</programlisting>
- <para>
- The <filename>plugins.h</filename> file contains declarations
- related to the MySQL plugin framework.
- </para>
+ <para>
+ The <filename>plugins.h</filename> file contains declarations
+ related to the MySQL plugin framework.
+ </para>
- <para>
- Additionally, the following macro must be appended to your
- <filename><replaceable>storage-engine</replaceable>.cc</filename>
- file:
- </para>
+ <para>
+ Additionally, the following macro must be appended to your
+ <filename><replaceable>storage-engine</replaceable>.cc</filename>
+ file:
+ </para>
<programlisting>
mysql_declare_plugin
@@ -63,72 +63,72 @@
mysql_declare_plugin_end;
</programlisting>
- <para>
- The preceding example is from the <literal>CSV</literal>
- storage engine.
- </para>
+ <para>
+ The preceding example is from the <literal>CSV</literal> storage
+ engine.
+ </para>
- <para>
- The first element in the macro declares that this plugin is a
- storage engine. The second element is a pointer to the storage
- engine's
- <link
+ <para>
+ The first element in the macro declares that this plugin is a
+ storage engine. The second element is a pointer to the storage
+ engine's
+ <link
linkend="custom-engine-handlerton">handlerton</link>.
- The third element is the name of the plugin. The fourth
- element is the author of the plugin. The fifth element is a
- description of the plugin.
- </para>
+ The third element is the name of the plugin. The fourth element is
+ the author of the plugin. The fifth element is a description of
+ the plugin.
+ </para>
- <para>
- The <function>init</function> function performs any static
- initialization required for the plugin, such as creating
- mutexes and other internal structures.
- </para>
+ <para>
+ The <function>init</function> function performs any static
+ initialization required for the plugin, such as creating mutexes
+ and other internal structures.
+ </para>
- <para>
- The <function>done</function> function is used to free all
- resources used by the plugin.
- </para>
+ <para>
+ The <function>done</function> function is used to free all
+ resources used by the plugin.
+ </para>
- <para>
- The storage engine should have a <function>panic</function>
- function declared in its
- <link linkend="custom-engine-handlerton">handlerton</link>.
- Upon shutdown of <literal>mysqld</literal>, the panic function
- is usually passed an argument of value
- <literal>HA_PANIC_CLOSE</literal>, where the storage engine
- should close all open tables. However, if the storage engine
- is a pluggable, and the user attempts to un-install a storage
- engine at runtime, the value of the panic argument will be
- <literal>HA_PANIC_TRY_CLOSE</literal>. If the storage engine
- has any open handler instances, it should return a nonzero
- fail value, otherwise it should close all files and perform
- any necessary cleanup.
- </para>
+ <para>
+ The storage engine should have a <function>panic</function>
+ function declared in its
+ <link linkend="custom-engine-handlerton">handlerton</link>. Upon
+ shutdown of <literal>mysqld</literal>, the panic function is
+ usually passed an argument of value
+ <literal>HA_PANIC_CLOSE</literal>, where the storage engine should
+ close all open tables. However, if the storage engine is a
+ pluggable, and the user attempts to un-install a storage engine at
+ runtime, the value of the panic argument will be
+ <literal>HA_PANIC_TRY_CLOSE</literal>. If the storage engine has
+ any open handler instances, it should return a nonzero fail value,
+ otherwise it should close all files and perform any necessary
+ cleanup.
+ </para>
- <para>
- In the case of a pluggable storage engine, returning a nonzero
- value from the handlerton <function>init</function> function
- does not prevent the storage engine shared library from being
- loaded -- only the failure of the plugin
- <function>init</function> function can prevent loading.
- However, if the handlerton <function>init</function> function
- returns failure, then the storage engine will be installed in
- the <literal>DISABLED</literal> state.
- </para>
+ <para>
+ In the case of a pluggable storage engine, returning a nonzero
+ value from the handlerton <function>init</function> function does
+ not prevent the storage engine shared library from being loaded --
+ only the failure of the plugin <function>init</function> function
+ can prevent loading. However, if the handlerton
+ <function>init</function> function returns failure, then the
+ storage engine will be installed in the
+ <literal>DISABLED</literal> state.
+ </para>
- </section>
+ </section>
- <section id="custom-engine-build-makefile">
+ <section id="custom-engine-build-makefile">
- <title>Creating a Makefile to Build a Custom Storage Engine</title>
+ <title>Creating a Makefile to Build a Custom Storage Engine</title>
- <para>
- A <filename>Makefile.am</filename> file can be created for
- your custom storage engine using <command>Libtool</command>.
- The following sample Makefile is for the pluggable version of
- the <literal>CSV</literal> engine:
- </para>
+ <para>
+ A <filename>Makefile.am</filename> file can be created for your
+ custom storage engine using <command>Libtool</command>. The
+ following sample Makefile is for the pluggable version of the
+ <literal>CSV</literal> engine:
+ </para>
<programlisting>
MYSQLDATAdir = $(localstatedir)
@@ -152,187 +152,185 @@
# Don't update the files from bitkeeper %::SCCS/s.%
</programlisting>
- </section>
+ </section>
- <section id="custom-engine-build-buildobject">
+ <section id="custom-engine-build-buildobject">
- <title>Building a Shared Object</title>
+ <title>Building a Shared Object</title>
+ <para>
+ Once the Makefile is created, use the following steps to build a
+ pluggable shared object:
+ </para>
+
+ <orderedlist>
+
+ <listitem>
<para>
- Once the Makefile is created, use the following steps to build
- a pluggable shared object:
+ Navigate to the directory containing
+ <filename>Makefile.am</filename>.
</para>
+ </listitem>
- <orderedlist>
+ <listitem>
+ <para>
+ Type <command>make</command> to compile the shared object.
+ </para>
+ </listitem>
- <listitem>
- <para>
- Navigate to the directory containing
- <filename>Makefile.am</filename>.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ Type <command>make install</command> to install the shared
+ object into the MySQL server's library directory.
+ </para>
+ </listitem>
- <listitem>
- <para>
- Type <command>make</command> to compile the shared object.
- </para>
- </listitem>
+ </orderedlist>
- <listitem>
- <para>
- Type <command>make install</command> to install the shared
- object into the MySQL server's library directory.
- </para>
- </listitem>
+ </section>
- </orderedlist>
+ <section id="custom-engine-install">
- </section>
+ <title>Installing a Custom Storage Engine</title>
- <section id="custom-engine-install">
+ <para>
+ Once your storage engine is built, ensure the
+ <filename>.so</filename> file is in the MySQL server library
+ directory (typically <filename>installdir/lib</filename>).
+ </para>
- <title>Installing a Custom Storage Engine</title>
+ <para>
+ To install the plugin, issue the <literal>INSTALL PLUGIN</literal>
+ command:
+ </para>
- <para>
- Once your storage engine is built, ensure the
- <filename>.so</filename> file is in the MySQL server library
- directory (typically <filename>installdir/lib</filename>).
- </para>
-
- <para>
- To install the plugin, issue the <literal>INSTALL
- PLUGIN</literal> command:
- </para>
-
<programlisting>
INSTALL PLUGIN <replaceable>ha_foo</replaceable> SONAME
'<replaceable>ha_foo.so</replaceable>';
</programlisting>
- </section>
+ </section>
- <section id="custom-engine-uninstall">
+ <section id="custom-engine-uninstall">
- <title>Uninstalling a Custom Storage Engine</title>
+ <title>Uninstalling a Custom Storage Engine</title>
- <para>
- To uninstall a storage engine, use the <literal>UNINSTALL
- PLUGIN</literal> statement:
- </para>
+ <para>
+ To uninstall a storage engine, use the <literal>UNINSTALL
+ PLUGIN</literal> statement:
+ </para>
<programlisting>
UNINSTALL PLUGIN <replaceable>ha_foo</replaceable>;
</programlisting>
- <para>
- If you uninstall a storage engine that is being used by
- existing tables, those tables will not be accessible, but will
- still be present on disk (where applicable). Ensure that there
- are no tables using a given storage engine before uninstalling
- it otherwise the table will be inaccessible unless you
- re-install the storage engine.
- </para>
+ <para>
+ If you uninstall a storage engine that is being used by existing
+ tables, those tables will not be accessible, but will still be
+ present on disk (where applicable). Ensure that there are no
+ tables using a given storage engine before uninstalling it
+ otherwise the table will be inaccessible unless you re-install the
+ storage engine.
+ </para>
- </section>
+ </section>
- <section id="custom-engine-testing">
+ <section id="custom-engine-testing">
- <title>Testing a Custom Storage Engine</title>
+ <title>Testing a Custom Storage Engine</title>
- <para>
- The MySQL AB development team follows a test-driven approach
- for storage engine development: as functionality is developed
- and bugs are fixed, new tests are added to an extensive
- regression testing suite to ensure that new functionality
- works properly and old bugs are not re-introduced.
- </para>
+ <para>
+ The MySQL AB development team follows a test-driven approach for
+ storage engine development: as functionality is developed and bugs
+ are fixed, new tests are added to an extensive regression testing
+ suite to ensure that new functionality works properly and old bugs
+ are not re-introduced.
+ </para>
- <para>
- Developers of custom storage engines can use the same
- regression test suite to ensure the reliable operation of
- their storage engine.
- </para>
+ <para>
+ Developers of custom storage engines can use the same regression
+ test suite to ensure the reliable operation of their storage
+ engine.
+ </para>
- <para>
- For more information on the MySQL Test Suite, see
- <xref linkend="mysql-test-suite"/>.
- </para>
+ <para>
+ For more information on the MySQL Test Suite, see
+ <xref linkend="mysql-test-suite"/>.
+ </para>
- <section id="custom-engine-testing-testrun">
+ <section id="custom-engine-testing-testrun">
- <title>Running the Regression Test Suite</title>
+ <title>Running the Regression Test Suite</title>
- <para>
- To run the test suite follow these steps:
- </para>
+ <para>
+ To run the test suite follow these steps:
+ </para>
- <orderedlist>
+ <orderedlist>
- <listitem>
- <para>
- From the MySQL main directory tree change directory to
- the <filename>mysql-test</filename> directory.
- </para>
- </listitem>
-
- <listitem>
- <para>
- Run <command>perl ./mysql-test-run.pl</command>.
- </para>
- </listitem>
-
- </orderedlist>
-
+ <listitem>
<para>
- Running the script without options executes the complete
- test suite on a server running on the local machine.
+ From the MySQL main directory tree change directory to the
+ <filename>mysql-test</filename> directory.
</para>
+ </listitem>
+ <listitem>
<para>
- To run a subset of tests or a specific test case,
- execute <command>perl ./mysql-test-run.pl
- --do-test=abc</command>.This will execute all tests that
- start with <literal>abc</literal>
- (<literal>abc*.test</literal>).
+ Run <command>perl ./mysql-test-run.pl</command>.
</para>
+ </listitem>
- <para>
- For a complete list of options run <command>perl
- ./mysql-test-run.pl --help</command>.
- </para>
+ </orderedlist>
- </section>
+ <para>
+ Running the script without options executes the complete test
+ suite on a server running on the local machine.
+ </para>
- <section id="custom-engine-testing-custom">
+ <para>
+ To run a subset of tests or a specific test case, execute
+ <command>perl ./mysql-test-run.pl --do-test=abc</command>.This
+ will execute all tests that start with <literal>abc</literal>
+ (<literal>abc*.test</literal>).
+ </para>
- <title>Customizing Test Script for Custom Engine Use</title>
+ <para>
+ For a complete list of options run <command>perl
+ ./mysql-test-run.pl --help</command>.
+ </para>
- <para>
- The existing tests in the MySQL Test Suite are typically
- created against specific storage engines. As such, running
- the full test suite will not result in custom storage
- engines being tested.
- </para>
+ </section>
- <para>
- To add support for your storage engine to the test suite,
- you must first write tests against your storage engine. The
- simplest way to do this is to take an existing test script
- and modify the <literal>CREATE TABLE</literal> statements
- within to use your custom engine.
- </para>
+ <section id="custom-engine-testing-custom">
- <para>
- Tests are located in the <filename>mysql-test/t/</filename>.
- </para>
+ <title>Customizing Test Script for Custom Engine Use</title>
- <para>
- For more information on creating and modifying tests, see
- <xref linkend="extending-mysqltest"/>.
- </para>
+ <para>
+ The existing tests in the MySQL Test Suite are typically created
+ against specific storage engines. As such, running the full test
+ suite will not result in custom storage engines being tested.
+ </para>
- </section>
+ <para>
+ To add support for your storage engine to the test suite, you
+ must first write tests against your storage engine. The simplest
+ way to do this is to take an existing test script and modify the
+ <literal>CREATE TABLE</literal> statements within to use your
+ custom engine.
+ </para>
- </section>
+ <para>
+ Tests are located in the <filename>mysql-test/t/</filename>.
+ </para>
+ <para>
+ For more information on creating and modifying tests, see
+ <xref linkend="extending-mysqltest"/>.
+ </para>
+
</section>
+
+ </section>
+
+</section>
Modified: trunk/refman-5.1/custom-engine.xml
===================================================================
--- trunk/refman-5.1/custom-engine.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/custom-engine.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -353,8 +353,7 @@
<para>
For more information, see
- <xref
- linkend="custom-engine-savepoint-offset"/>.
+ <xref linkend="custom-engine-savepoint-offset"/>.
</para>
</listitem>
@@ -379,8 +378,7 @@
<para>
For more information, see
- <xref
- linkend="custom-engine-savepoint-set"/>.
+ <xref linkend="custom-engine-savepoint-set"/>.
</para>
</listitem>
@@ -396,8 +394,7 @@
<para>
For more information, see
- <xref
- linkend="custom-engine-savepoint-rollback"/>.
+ <xref linkend="custom-engine-savepoint-rollback"/>.
</para>
</listitem>
@@ -414,8 +411,7 @@
<para>
For more information, see
- <xref
- linkend="custom-engine-savepoint-release"/>.
+ <xref linkend="custom-engine-savepoint-release"/>.
</para>
</listitem>
@@ -431,8 +427,7 @@
<para>
For more information, see
- <xref
- linkend="custom-engine-transactions-commit"/>.
+ <xref linkend="custom-engine-transactions-commit"/>.
</para>
</listitem>
@@ -448,8 +443,7 @@
<para>
For more information, see
- <xref
- linkend="custom-engine-transactions-rollback"/>.
+ <xref linkend="custom-engine-transactions-rollback"/>.
</para>
</listitem>
@@ -524,8 +518,7 @@
<para>
For more information, see
- <xref
- linkend="custom-engine-instancing"/>.
+ <xref linkend="custom-engine-instancing"/>.
</para>
</listitem>
@@ -2262,8 +2255,7 @@
and then populate <literal>*buf</literal> with the matching row
in the MySQL internal row format. For more information on the
internal row format, see
- <xref
- linkend="custom-engine-table-scanning-next"/>.
+ <xref linkend="custom-engine-table-scanning-next"/>.
</para>
<para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/database-administration.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -496,8 +496,7 @@
For more precise control over the server SQL mode, use the
<option>--sql-mode</option> option instead. See
<xref linkend="ansi-mode"/>, and
- <xref
-linkend="server-sql-mode"/>.
+ <xref linkend="server-sql-mode"/>.
</para>
</listitem>
@@ -5175,8 +5174,8 @@
</para>
<para>
- (Windows only.) Whether or not the server allows
- shared-memory connections.
+ (Windows only.) Whether the server allows shared-memory
+ connections.
</para>
</listitem>
@@ -15602,8 +15601,8 @@
<para>
The <literal>Access denied</literal> error message tells you
who you are trying to log in as, the client host from which
- you are trying to connect, and whether or not you were using
- a password. Normally, you should have one row in the
+ you are trying to connect, and whether you were using a
+ password. Normally, you should have one row in the
<literal>user</literal> table that exactly matches the
hostname and username that were given in the error message.
For example, if you get an error message that contains
@@ -23973,7 +23972,7 @@
<para>
This section describes how the query cache works when it is
operational. <xref linkend="query-cache-configuration"/>,
- describes how to control whether or not it is operational.
+ describes how to control whether it is operational.
</para>
<para>
@@ -24030,8 +24029,7 @@
<para>
The query cache also works within transactions when using
<literal>InnoDB</literal> tables, making use of the table
- version number to detect whether or not its contents are still
- current.
+ version number to detect whether its contents are still current.
</para>
<para>
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/information-schema.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -3241,8 +3241,7 @@
server SQL mode</emphasis>). The possible range of values
for this column is the same as that of the
<literal>sql_mode</literal> system variable. See
- <xref
- linkend="server-sql-mode"/>.
+ <xref linkend="server-sql-mode"/>.
</para>
</listitem>
@@ -3643,7 +3642,7 @@
5.1.6.
</para>
</listitem>
-
+
<listitem>
<para>
<emphasis role="bold">Important</emphasis>: If any
@@ -3651,7 +3650,7 @@
5.1.6 are present following an upgrade to MySQL 5.1.6 or
later, it is not possible to <literal>SELECT</literal> from,
<literal>SHOW</literal>, or <literal>DESCRIBE</literal> the
- <literal>PARTITIONS</literal> table. See
+ <literal>PARTITIONS</literal> table. See
<xref linkend="news-5-1-6"/> <emphasis>before</emphasis>
upgrading from MySQL 5.1.5 or earlier to MySQL 5.1.6 or
later.
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/innodb.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -911,8 +911,8 @@
<literal><replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
in option files. For more information on specifying options and
system variables, see <xref linkend="program-options"/>. Many of
- the system variables can be changed at runtime (see xref
- linkend="dynamic-system-variables"/>).
+ the system variables can be changed at runtime (see
+ <xref linkend="dynamic-system-variables"/>).
</para>
<para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/installing.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -124,7 +124,7 @@
<listitem>
<para>
- Determine whether or not MySQL runs on your platform.
+ Determine whether MySQL runs on your platform.
</para>
</listitem>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/introduction.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1529,12 +1529,12 @@
<listitem>
<para>
- To be safe with MySQL Server, whether or not you use
- transactional tables, you only need to have backups and
- have binary logging turned on. When that is true, you can
- recover from any situation that you could with any other
- transactional database system. It is always good to have
- backups, regardless of which database system you use.
+ To be safe with MySQL Server, regardless of whether you
+ use transactional tables, you only need to have backups
+ and have binary logging turned on. When that is true, you
+ can recover from any situation that you could with any
+ other transactional database system. It is always good to
+ have backups, regardless of which database system you use.
</para>
</listitem>
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/ndbcluster.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -202,10 +202,10 @@
<para>
<emphasis role="bold">Note</emphasis>: In many contexts, the term
- <quote>node</quote> is used to indicate a computer, but when discussing MySQL
- Cluster it means a <emphasis>process</emphasis>. There can be any
- number of nodes on a single computer, for which we use the term
- <emphasis role="bold">cluster host</emphasis>.
+ <quote>node</quote> is used to indicate a computer, but when
+ discussing MySQL Cluster it means a <emphasis>process</emphasis>.
+ There can be any number of nodes on a single computer, for which
+ we use the term <emphasis role="bold">cluster host</emphasis>.
</para>
<para>
@@ -847,7 +847,7 @@
Check your <filename>/etc/passwd</filename> and
<filename>/etc/group</filename> files (or use whatever tools
are provided by your operating system for manging users and
- groups) to see whether or not there are already a
+ groups) to see whether there is already a
<literal>mysql</literal> group and <literal>mysql</literal>
user on the system, as some OS distributions create these as
part of the operating system installation process. If these
@@ -2859,10 +2859,10 @@
</para>
<para>
- If no node IDs are provided then the order of the data
- nodes will be the determining factor for the node group.
- Whether or not explicit assignments are made, they can be
- viewed in the output of the management client's
+ If no node IDs are provided, the order of the data nodes
+ will be the determining factor for the node group. Whether
+ or not explicit assignments are made, they can be viewed
+ in the output of the management client's
<literal>SHOW</literal> command.
</para>
@@ -4548,9 +4548,9 @@
All update activities also need to be logged. This log
makes it possible to replay these updates whenever the
system is restarted. The NDB recovery algorithm uses a
- <quote>fuzzy</quote> checkpoint of the data together with the UNDO log,
- and then applies the REDO log to play back all changes up
- to the restoration point.
+ <quote>fuzzy</quote> checkpoint of the data together with
+ the UNDO log, and then applies the REDO log to play back
+ all changes up to the restoration point.
</para>
<para>
@@ -10255,12 +10255,11 @@
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 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 necessary to set the
- <literal>LD_PRELOAD</literal> environment variable as shown
- later in this section.)
+ 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>
@@ -10588,7 +10587,7 @@
<xref linkend="partitioning-management-range-list"/> and
<xref linkend="alter-table"/>.
</para>
-
+
<para>
As of MySQL 5.1.6, all Cluster tables are by default
partitioned by <literal>KEY</literal> using the table's
@@ -10596,7 +10595,7 @@
explicitly set for the table, then the
<quote>hidden</quote> primary key automatically created by
the <literal>NDB</literal> storage engine is used instead.
- For additional discussion of these and related issues, see
+ For additional discussion of these and related issues, see
<xref linkend="partitioning-key"/>.
</para>
</listitem>
@@ -11683,11 +11682,11 @@
<para>
Cluster is supported in all MySQL-max binaries in the
¤t-series; release series, except as noted in the
- following paragraph. You can determine whether or not your
- server has NDB support using either of the commands
- <literal>SHOW VARIABLES LIKE 'have_%';</literal> or
- <literal>SHOW ENGINES;</literal>. (See
- <xref linkend="mysqld-max"/>, for more information.)
+ following paragraph. You can determine whether your server has
+ NDB support using either of the commands <literal>SHOW
+ VARIABLES LIKE 'have_%';</literal> or <literal>SHOW
+ ENGINES;</literal>. (See <xref linkend="mysqld-max"/>, for
+ more information.)
</para>
<para>
Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/partitioning.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -35,7 +35,7 @@
commands for use with partitioned tables are discussed in
<xref linkend="partitioning-maintenance"/>.
</para>
-
+
<para>
<emphasis role="bold">Important</emphasis>: Partitioned tables
created with MySQL versions prior to 5.1.6 cannot be read by a 5.1.6
@@ -152,7 +152,7 @@
This section provides a conceptual overview of partitioning in
MySQL ¤t-series;.
</para>
-
+
<para>
For information on partitioning restrictions and feature
limitations, see <xref linkend="partitioning-limitations"/>.
@@ -230,8 +230,8 @@
with partitioning support, nothing further needs to be done in
order to enable it (for example, no special entries are required
in your <filename>my.cnf</filename> file). You can determine
- whether or not your MySQL server supports partitioning by means of
- a <literal>SHOW VARIABLES</literal> command such as this one:
+ whether your MySQL server supports partitioning by means of a
+ <literal>SHOW VARIABLES</literal> command such as this one:
</para>
<programlisting>
@@ -252,10 +252,10 @@
VARIABLES</literal>, then your version of MySQL does not support
partitioning.
</para>
-
+
<para>
Prior to MySQL 5.1.6, this variable was named
- <literal>have_partition_engine</literal>. (Bug #16718)
+ <literal>have_partition_engine</literal>. (Bug #16718)
</para>
<para>
@@ -1392,15 +1392,16 @@
KEY</literal> are similar to those for creating a table that is
partitioned by hash. The major differences are that:
</para>
-
+
<itemizedlist>
+
<listitem>
<para>
<literal>KEY</literal> is used rather than
<literal>HASH</literal>.
</para>
</listitem>
-
+
<listitem>
<para>
<literal>KEY</literal> takes only a list of one or more
@@ -1408,16 +1409,15 @@
columns used as the partitioning key must comprise part or
all of the table's primary key, if the table has one.
</para>
-
+
<para>
Beginning with MySQL 5.1.6, <literal>KEY</literal> takes a
list of zero or more column names. Where no column name is
specified as the partitioning key, the table's primary key
is used. For example, the following <literal>CREATE
- TABLE</literal> statement is valid in MySQL 5.1.6 or
- later:
+ TABLE</literal> statement is valid in MySQL 5.1.6 or later:
</para>
-
+
<programlisting>
CREATE TABLE k1 (
id INT NOT NULL PRIMARY KEY,
@@ -1426,7 +1426,7 @@
PARTITION BY KEY()
PARTITIONS 2;
</programlisting>
-
+
<para>
In this case, the partitioning key is the
<literal>id</literal> column, even though it is not shown in
@@ -1434,7 +1434,7 @@
<literal>PARTITION_EXPRESSION</literal> column of the
<literal>INFORMATION_SCHEMA.PARTITIONS</literal> table.
</para>
-
+
<para>
<emphasis role="bold">Note</emphasis>: Also beginning with
MySQL 5.1.6, tables using the <literal>NDB Cluster</literal>
@@ -1443,7 +1443,7 @@
as the partitioning key. For example, consider a table
created using the following statement:
</para>
-
+
<programlisting>
CREATE TABLE kndb (
id INT NOT NULL PRIMARY KEY,
@@ -1451,13 +1451,13 @@
)
ENGINE=NDBCLUSTER;
</programlisting>
-
+
<para>
Although there is no <literal>PARTITION BY</literal> clause
in the table creation statement, the output of <literal>SHOW
- CREATE TABLE kndb</literal> is as shown here:
+ CREATE TABLE kndb</literal> is as shown here:
</para>
-
+
<programlisting>
CREATE TABLE `kndb` (
`id` int(11) NOT NULL,
@@ -1466,31 +1466,31 @@
)
ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY ();
</programlisting>
-
+
<para>
In the event that the Cluster table has no explicit primary
key, the <quote>hidden</quote> primary key generated by the
<literal>NDB</literal> storage engine for each Cluster table
- is used as the partitioning key.
+ is used as the partitioning key.
</para>
-
+
<para>
<emphasis role="bold">Important</emphasis>: For a
key-partitioned table using any MySQL storage engine other
than <literal>NDB CLuster</literal>, you cannot execute an
<literal>ALTER TABLE DROP PRIMARY KEY</literal>, as doing so
generates the error <errortext>ERROR 1466 (HY000): Field in
- list of fields for partition function not found in
- table</errortext>. This is not an issue for MySQL CLuster
+ list of fields for partition function not found in
+ table</errortext>. This is not an issue for MySQL CLuster
tables which are partitioned by <literal>KEY</literal>; in
such cases, the table is reorganized using the
<quote>hidden</quote> primary key as the table's new
partitioning key. See <xref linkend="ndbcluster"/>.
</para>
</listitem>
+
</itemizedlist>
-
-
+
<indexterm>
<primary>partitioning by linear key</primary>
</indexterm>
@@ -1998,12 +1998,12 @@
-rw-rw---- 1 mysql mysql 0 2005-11-04 18:41 tnhash#P#p0.MYD
-rw-rw---- 1 mysql mysql 0 2005-11-04 18:41 tnhash#P#p1.MYD
</programlisting>
-
+
<para>
(<emphasis role="bold">Note</emphasis>: Prior to MySQL 5.1.5,
these files would have been named
<filename>tnhash_p0.MYD</filename> and
- <filename>tnhash_p1.MYD</filename>. See
+ <filename>tnhash_p1.MYD</filename>. See
<xref linkend="news-5-1-6"/> and Bug #13437 for information
regarding how this change impacts upgrades.)
</para>
@@ -2163,8 +2163,8 @@
<para>
The statement <literal>ALTER TABLE ... PARTITION BY ...</literal>
is available and is functional beginning with MySQL 5.1.6;
- previously in MySQL 5.1, this was accepted as valid syntax, but the
- statement did nothing.
+ previously in MySQL 5.1, this was accepted as valid syntax, but
+ the statement did nothing.
</para>
<para>
@@ -2524,13 +2524,13 @@
dealing with a large amounts of data. This also might not be
feasible in situations where high availability is a requirement.
</para>
-
+
<para>
Beginning with MySQL 5.1.6, you can add multiple partitions in a
single <literal>ALTER TABLE ... ADD PARTITION</literal>
statement as shown here:
</para>
-
+
<programlisting>
CREATE TABLE employees (
id INT NOT NULL,
@@ -3386,16 +3386,18 @@
</section>
</section>
-
+
<section id="partitioning-limitations">
+
<title>&title-partitioning-limitations;</title>
-
+
<para>
This section discusses current restrictions and limitations on
MySQL partitioning support, as listed here:
</para>
-
+
<itemizedlist>
+
<listitem>
<para>
Partitioned tables do not support foreign keys. This includes
@@ -3403,19 +3405,19 @@
storage engine.
</para>
</listitem>
-
+
<listitem>
<para>
Partitioned table may use any available MySQL storage engine;
however, all of the table's partitions and subpartitions (if
there are any of the latter) use the same engine.
</para>
-
+
<para>
We expect to lift this restriction in a future MySQL release.
</para>
</listitem>
-
+
<listitem>
<para>
A partitioning key must be either an integer column or an
@@ -3425,16 +3427,16 @@
this is subject to change.
</para>
</listitem>
-
+
<listitem>
<para>
Subpartitions are limited to <literal>HASH</literal> or
<literal>KEY</literal> partitioning.
</para>
</listitem>
+
</itemizedlist>
-
+
</section>
-
-
+
</chapter>
Modified: trunk/refman-5.1/pluggable-storage.xml
===================================================================
--- trunk/refman-5.1/pluggable-storage.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/pluggable-storage.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -421,33 +421,38 @@
</tbody>
</tgroup>
</informaltable>
-
+
<itemizedlist>
+
<listitem>
<para>
[1] Storage engine supports spatial data types but no indexing
of such data
</para>
</listitem>
+
<listitem>
<para>
- [2] Implemented in the server (via encryption functions),
+ [2] Implemented in the server (via encryption functions),
rather than in the storage engine
</para>
</listitem>
+
<listitem>
<para>
- [3] Implemented in the server,
- rather than in the storage engine
+ [3] Implemented in the server, rather than in the storage
+ engine
</para>
</listitem>
+
<listitem>
<para>
[4] EB = exabyte (1024 * 1024 terabyte)
</para>
</listitem>
+
</itemizedlist>
-
+
<para>
The following storage engines are the most commonly used:
</para>
Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/problems.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1147,7 +1147,7 @@
<listitem>
<para>
- Indicate whether or not the MySQL server died. You can find
+ Indicate whether the MySQL server died. You can find
information about this in the server error log. See
<xref linkend="crashing"/>.
</para>
@@ -1515,9 +1515,7 @@
table, MySQL uses the
<literal>myisam_data_pointer_size</literal> system variable.
The default value is 6 bytes, which is enough to allow 256TB
- of data. See
- <xref
- linkend="server-system-variables"/>.
+ of data. See <xref linkend="server-system-variables"/>.
</para>
<para>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/replication.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -2799,8 +2799,8 @@
<para>
The main reason for this <quote>just check the default
database</quote> behavior is that it is difficult from the
- statement alone to know whether or not it should be replicated
- (for example, if you are using multiple-table
+ statement alone to know whether it should be replicated (for
+ example, if you are using multiple-table
<literal>DELETE</literal> statements or multiple-table
<literal>UPDATE</literal> statements that act across multiple
databases). It is also faster to check only the default
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-25 19:21:01 UTC (rev 1034)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-25 19:42:32 UTC (rev 1035)
@@ -1627,8 +1627,8 @@
<para>
The table name can be specified as
<replaceable>db_name.tbl_name</replaceable> to create the table
- in a specific database. This works whether or not there is a
- default database. If you use quoted identifiers, quote the
+ in a specific database. This works regardless of whether there
+ is a default database. If you use quoted identifiers, quote the
database and table names separately. For example,
<literal>`mydb`.`mytbl`</literal> is legal, but
<literal>`mydb.mytbl`</literal> is not.
@@ -5487,13 +5487,13 @@
If you specify <literal>IGNORE</literal>, input rows that
duplicate an existing row on a unique key value are skipped. If
you do not specify either option, the behavior depends on
- whether or not the <literal>LOCAL</literal> keyword is
- specified. Without <literal>LOCAL</literal>, an error occurs
- when a duplicate key value is found, and the rest of the text
- file is ignored. With <literal>LOCAL</literal>, the default
- behavior is the same as if <literal>IGNORE</literal> is
- specified; this is because the server has no way to stop
- transmission of the file in the middle of the operation.
+ whether the <literal>LOCAL</literal> keyword is specified.
+ Without <literal>LOCAL</literal>, an error occurs when a
+ duplicate key value is found, and the rest of the text file is
+ ignored. With <literal>LOCAL</literal>, the default behavior is
+ the same as if <literal>IGNORE</literal> is specified; this is
+ because the server has no way to stop transmission of the file
+ in the middle of the operation.
</para>
<para>
@@ -19590,7 +19590,7 @@
</para>
<para>
- Whether or not the SQL thread is started.
+ Whether the SQL thread is started.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1035 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 25 Jan |
