Author: paul
Date: 2006-01-25 02:13:59 +0100 (Wed, 25 Jan 2006)
New Revision: 1027
Log:
r6657@frost: paul | 2006-01-24 19:13:10 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/connector-odbc.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/innodb.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/optimization.xml
trunk/refman-4.1/problems.xml
trunk/refman-4.1/replication.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-4.1/storage-engines.xml
trunk/refman-4.1/tutorial.xml
trunk/refman-5.0/apis.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/connector-odbc.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/optimization.xml
trunk/refman-5.0/problems.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.0/restrictions.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/storage-engines.xml
trunk/refman-5.0/tutorial.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/connector-odbc.xml
trunk/refman-5.1/custom-engine.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/innodb.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/optimization.xml
trunk/refman-5.1/problems.xml
trunk/refman-5.1/replication.xml
trunk/refman-5.1/restrictions.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.1/storage-engines.xml
trunk/refman-5.1/tutorial.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6654
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2497
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6657
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2497
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/apis.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -7224,12 +7224,12 @@
4.1.3. MySQL 4.1 supports only one type of shutdown;
<literal>shutdown_level</literal> must be equal to
<literal>SHUTDOWN_DEFAULT</literal>. Additional shutdown
- levels are planned in order to make it possible to choose the
- desired level. Dynamically linked executables which have been
- compiled with older versions of the
- <literal>libmysqlclient</literal> headers and call
- <literal>mysql_shutdown()</literal> need to be used with the
- old <literal>libmysqlclient</literal> dynamic library.
+ levels are planned to make it possible to choose the desired
+ level. Dynamically linked executables which have been compiled
+ with older versions of the <literal>libmysqlclient</literal>
+ headers and call <literal>mysql_shutdown()</literal> need to
+ be used with the old <literal>libmysqlclient</literal> dynamic
+ library.
</para>
<para>
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/client-utility-programs.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -8900,10 +8900,10 @@
‘<literal>_</literal>’), only those names that are
matched by the wildcard are shown. If a database name contains
any underscores, those should be escaped with a backslash
- (some Unix shells require two) in order to get a list of the
- proper tables or columns. ‘<literal>*</literal>’
- and ‘<literal>?</literal>’ characters are
- converted into SQL ‘<literal>%</literal>’ and
+ (some Unix shells require two) to get a list of the proper
+ tables or columns. ‘<literal>*</literal>’ and
+ ‘<literal>?</literal>’ characters are converted
+ into SQL ‘<literal>%</literal>’ and
‘<literal>_</literal>’ wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a ‘<literal>_</literal>’ in the
Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/connector-odbc.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -1422,8 +1422,8 @@
<title>&title-myodbc-unix-thread-safe;</title>
<para>
- To link the driver with MySQL thread safe client
- libraries <filename>libmysqlclient_r.so</filename> or
+ To link the driver with MySQL thread safe client libraries
+ <filename>libmysqlclient_r.so</filename> or
<filename>libmysqlclient_r.a</filename>, you must specify the
following <command>configure</command> option:
</para>
@@ -2501,8 +2501,7 @@
<para>
<emphasis role="bold">Note</emphasis>: If you are using
- unixODBC, you can use the following tools in order to set up the
- DSN:
+ unixODBC, you can use the following tools to set up the DSN:
</para>
<itemizedlist>
@@ -4294,8 +4293,8 @@
<title>&title-msaccess-setup;</title>
<para>
- The following must be done on your client PC in order to make
- Microsoft Access work with MyODBC.
+ The following must be done on your client PC to make Microsoft
+ Access work with MyODBC.
</para>
<orderedlist>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/database-administration.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -9400,13 +9400,13 @@
<listitem>
<para>
You might want to use the <option>--user</option> option
- for <command>mysqld</command>, but in order to do this
- you need to run the <command>mysqld_multi</command>
- script as the Unix <literal>root</literal> user. Having
- the option in the option file does not matter; you
- merely get a warning if you are not the superuser and
- the <command>mysqld</command> processes are started
- under your own Unix account.
+ for <command>mysqld</command>, but to do this you need
+ to run the <command>mysqld_multi</command> script as the
+ Unix <literal>root</literal> user. Having the option in
+ the option file does not matter; you merely get a
+ warning if you are not the superuser and the
+ <command>mysqld</command> processes are started under
+ your own Unix account.
</para>
</listitem>
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/innodb.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -241,15 +241,15 @@
recovery capabilities. <emphasis role="bold">However, it cannot do
so</emphasis> if the underlying operating system or hardware does
not work as advertised. Many operating systems or disk subsystems
- may delay or reorder write operations in order to improve
- performance. On some operating systems, the very system call that
- should wait until all unwritten data for a file has been flushed
- — <literal>fsync()</literal> — might actually return
- before the data has been flushed to stable storage. Because of
- this, an operating system crash or a power outage may destroy
- recently committed data, or in the worst case, even corrupt the
- database because of write operations having been reordered. If
- data integrity is important to you, you should perform some
+ may delay or reorder write operations to improve performance. On
+ some operating systems, the very system call that should wait
+ until all unwritten data for a file has been flushed —
+ <literal>fsync()</literal> — might actually return before
+ the data has been flushed to stable storage. Because of this, an
+ operating system crash or a power outage may destroy recently
+ committed data, or in the worst case, even corrupt the database
+ because of write operations having been reordered. If data
+ integrity is important to you, you should perform some
<quote>pull-the-plug</quote> tests before using anything in
production. On Mac OS X 10.3 and up, <literal>InnoDB</literal>
uses a special <literal>fcntl()</literal> file flush method. Under
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/installing.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -15659,10 +15659,10 @@
<para>
For older versions of FreeBSD, you must recompile your kernel
- in order to change the maximum data segment size for a
- process. In this case, you should look at the
- <literal>MAXDSIZ</literal> option in the
- <literal>LINT</literal> config file for more information.
+ to change the maximum data segment size for a process. In this
+ case, you should look at the <literal>MAXDSIZ</literal> option
+ in the <literal>LINT</literal> config file for more
+ information.
</para>
<para>
Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/optimization.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -720,7 +720,7 @@
<para>
With the help of <literal>EXPLAIN</literal>, you can see where
- you should add indexes to tables in order to get a faster
+ you should add indexes to tables to get a faster
<literal>SELECT</literal> that uses indexes to find rows. You
can also use <literal>EXPLAIN</literal> to check whether the
optimizer joins the tables in an optimal order. To force the
@@ -4193,8 +4193,8 @@
(observing what is referred to in database theory as
<firstterm>third normal form</firstterm>). However, there
may be situations in which it can be advantageous to
- duplicate information or create summary tables in order to
- gain more speed.
+ duplicate information or create summary tables to gain more
+ speed.
</para>
</listitem>
@@ -6776,8 +6776,7 @@
<literal>table_cache</literal> entries. The default value is 64;
this can be changed with the <option>--table_cache</option>
option to <command>mysqld</command>. Note that MySQL may
- temporarily open more tables than this in order to execute
- queries.
+ temporarily open more tables than this to execute queries.
</para>
<para>
Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/problems.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -764,9 +764,9 @@
Improved"; new in PHP 5) <emphasis role="bold">is</emphasis>
compatible with the improved password hashing employed in MySQL
4.1 and higher, and no special configuration of MySQL need be
- done in order to use this newer MySQL client library for PHP.
- For more information about the <literal>mysqli</literal>
- extension, see <ulink url="http://php.net/mysqli"/>.
+ done to use this newer MySQL client library for PHP. For more
+ information about the <literal>mysqli</literal> extension, see
+ <ulink url="http://php.net/mysqli"/>.
</para>
<para>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/replication.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -222,8 +222,8 @@
Dump</literal> thread sends and copies this data to local files,
known as <emphasis>relay logs</emphasis>, in the slave's data
directory. The third thread is the SQL thread, which the slave
- creates in order to read the relay logs and to execute the updates
- they contain.
+ creates to read the relay logs and to execute the updates they
+ contain.
</para>
<para>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/sql-syntax.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -206,8 +206,8 @@
and then the original table is deleted and the new one is
renamed. While <literal>ALTER TABLE</literal> is executing, the
original table is readable by other clients. Updates and writes
- to the table are stalled until the new table is ready, then are
- automatically redirected to the new table without any failed
+ to the table are stalled until the new table is ready, and then
+ are automatically redirected to the new table without any failed
updates.
</para>
@@ -738,8 +738,8 @@
<para>
To import the backup <filename>.ibd</filename> file back
- into the table, copy it into the database directory, then
- issue this statement:
+ into the table, copy it into the database directory, and
+ then issue this statement:
</para>
<programlisting>
@@ -758,8 +758,8 @@
</indexterm>
With the <literal>mysql_info()</literal> C API function, you
- can find out how many records were copied, and (when
- <literal>IGNORE</literal> is used) how many records were
+ can find out how many rows were copied, and (when
+ <literal>IGNORE</literal> is used) how many rows were
deleted due to duplication of unique key values. See
<xref linkend="mysql-info"/>.
</para>
@@ -1343,8 +1343,7 @@
non-<literal>TEMPORARY</literal> table of the same name. (The
existing table is hidden until the temporary table is dropped.)
From MySQL 4.0.2 on, you must have the <literal>CREATE TEMPORARY
- TABLES</literal> privilege to be able to create temporary
- tables.
+ TABLES</literal> privilege to create temporary tables.
</para>
<para>
@@ -1355,7 +1354,7 @@
<literal>CREATE TABLE</literal> statement.
<emphasis>Note</emphasis>: If you use <literal>IF NOT
EXISTS</literal> in a <literal>CREATE TABLE ... SELECT</literal>
- statement, any records selected by the <literal>SELECT</literal>
+ statement, any rows selected by the <literal>SELECT</literal>
part are inserted whether or not the table already exists.
</para>
@@ -1938,7 +1937,7 @@
<para>
For <literal>MyISAM</literal> and <literal>ISAM</literal>
tables, each <literal>NULL</literal> column takes one bit
- extra, rounded up to the nearest byte. The maximum record
+ extra, rounded up to the nearest byte. The maximum row
length in bytes can be calculated as follows:
</para>
@@ -1951,11 +1950,10 @@
<para>
<replaceable>delete_flag</replaceable> is 1 for tables with
- static record format. Static tables use a bit in the row
- record for a flag that indicates whether the row has been
- deleted. <replaceable>delete_flag</replaceable> is 0 for
- dynamic tables because the flag is stored in the dynamic row
- header.
+ static row format. Static tables use a bit in the row record
+ for a flag that indicates whether the row has been deleted.
+ <replaceable>delete_flag</replaceable> is 0 for dynamic
+ tables because the flag is stored in the dynamic row header.
</para>
<para>
@@ -2122,7 +2120,7 @@
<para>
An approximation of the average row length for your table.
You need to set this only for large tables with
- variable-size records.
+ variable-size rows.
</para>
<para>
@@ -2602,13 +2600,13 @@
<para>
You can precede the <literal>SELECT</literal> by
<literal>IGNORE</literal> or <literal>REPLACE</literal> to
- indicate how to handle records that duplicate unique key values.
- With <literal>IGNORE</literal>, new records that duplicate an
- existing record on a unique key value are discarded. With
- <literal>REPLACE</literal>, new records replace records that
- have the same unique key value. If neither
- <literal>IGNORE</literal> nor <literal>REPLACE</literal> is
- specified, duplicate unique key values result in an error.
+ indicate how to handle rows that duplicate unique key values.
+ With <literal>IGNORE</literal>, new rows that duplicate an
+ existing row on a unique key value are discarded. With
+ <literal>REPLACE</literal>, new rows replace rows that have the
+ same unique key value. If neither <literal>IGNORE</literal> nor
+ <literal>REPLACE</literal> is specified, duplicate unique key
+ values result in an error.
</para>
<para>
@@ -3225,7 +3223,7 @@
<literal>DELETE</literal> deletes rows from
<replaceable>tbl_name</replaceable> that satisfy the condition
given by <replaceable>where_definition</replaceable>, and
- returns the number of records deleted.
+ returns the number of rows deleted.
</para>
<para>
@@ -3241,11 +3239,11 @@
<para>
In MySQL 3.23, <literal>DELETE</literal> without a
<literal>WHERE</literal> clause returns zero as the number of
- affected records.
+ affected rows.
</para>
<para>
- In MySQL 3.23, if you really want to know how many records are
+ In MySQL 3.23, if you really want to know how many rows are
deleted when you are deleting all rows, and are willing to
suffer a speed penalty, you can use a <literal>DELETE</literal>
statement that includes a <literal>WHERE</literal> clause with
@@ -3330,14 +3328,13 @@
</para>
<para>
- In <literal>MyISAM</literal> tables, deleted records are
- maintained in a linked list and subsequent
- <literal>INSERT</literal> operations reuse old record positions.
- To reclaim unused space and reduce file sizes, use the
- <literal>OPTIMIZE TABLE</literal> statement or the
- <command>myisamchk</command> utility to reorganize tables.
- <literal>OPTIMIZE TABLE</literal> is easier, but
- <command>myisamchk</command> is faster. See
+ In <literal>MyISAM</literal> tables, deleted rows are maintained
+ in a linked list and subsequent <literal>INSERT</literal>
+ operations reuse old row positions. To reclaim unused space and
+ reduce file sizes, use the <literal>OPTIMIZE TABLE</literal>
+ statement or the <command>myisamchk</command> utility to
+ reorganize tables. <literal>OPTIMIZE TABLE</literal> is easier,
+ but <command>myisamchk</command> is faster. See
<xref linkend="optimize-table"/>, and
<xref linkend="optimization"/>.
</para>
@@ -3371,14 +3368,14 @@
<listitem>
<para>
- Insert many records into the table. Each insert results in
- an index value that is added to the high end of the index.
+ Insert many rows into the table. Each insert results in an
+ index value that is added to the high end of the index.
</para>
</listitem>
<listitem>
<para>
- Delete a block of records at the low end of the column range
+ Delete a block of rows at the low end of the column range
using <literal>DELETE QUICK</literal>.
</para>
</listitem>
@@ -3389,9 +3386,9 @@
In this scenario, the index blocks associated with the deleted
index values become underfilled but are not merged with other
index blocks due to the use of <literal>QUICK</literal>. They
- remain underfilled when new inserts occur, because new records
- does not have index values in the deleted range. Furthermore,
- they remain underfilled even if you later use
+ remain underfilled when new inserts occur, because new rows does
+ not have index values in the deleted range. Furthermore, they
+ remain underfilled even if you later use
<literal>DELETE</literal> without <literal>QUICK</literal>,
unless some of the deleted index values happen to lie in index
blocks within or adjacent to the underfilled blocks. To reclaim
@@ -4124,8 +4121,8 @@
</programlisting>
<para>
- The rows-affected value is 1 if the row is inserted as a new
- record and 2 if an existing record is updated.
+ The rows-affected value is 1 if the row is inserted as a new row
+ and 2 if an existing row is updated.
</para>
<para>
@@ -4358,8 +4355,8 @@
Prior to MySQL 4.0.1, <literal>INSERT ... SELECT</literal>
implicitly operates in <literal>IGNORE</literal> mode. As
of MySQL 4.0.1, specify <literal>IGNORE</literal>
- explicitly to ignore records that would cause
- duplicate-key violations.
+ explicitly to ignore rows that would cause duplicate-key
+ violations.
</para>
</listitem>
@@ -4381,9 +4378,9 @@
<remark>
(The problem is that the @code{SELECT} possibly would find
- records that were inserted earlier during the same run.
- When using subquery clauses, the situation could easily be
- very confusing.)
+ rows that were inserted earlier during the same run. When
+ using subquery clauses, the situation could easily be very
+ confusing.)
</remark>
</listitem>
@@ -4616,7 +4613,7 @@
<listitem>
<para>
The client cannot obtain from the server the number of
- duplicate records or the <literal>AUTO_INCREMENT</literal>
+ duplicate rows or the <literal>AUTO_INCREMENT</literal>
value for the resulting row, because the
<literal>INSERT</literal> returns before the insert
operation has been completed. (If you use the C API, the
@@ -4842,11 +4839,10 @@
If you specify <literal>CONCURRENT</literal> with a
<literal>MyISAM</literal> table that satisfies the condition for
concurrent inserts (that is, it contains no free blocks in the
- middle), then other threads can retrieve data from the table
- while <literal>LOAD DATA</literal> is executing. Using this
- option affects the performance of <literal>LOAD DATA</literal> a
- bit, even if no other thread is using the table at the same
- time.
+ middle), other threads can retrieve data from the table while
+ <literal>LOAD DATA</literal> is executing. Using this option
+ affects the performance of <literal>LOAD DATA</literal> a bit,
+ even if no other thread is using the table at the same time.
</para>
<para>
@@ -4964,8 +4960,8 @@
<literal>LOCAL</literal> works only if your server and your
client both have been enabled to allow it. For example, if
<command>mysqld</command> was started with
- <option>--local-infile=0</option>, then <literal>LOCAL</literal>
- does not work. See <xref linkend="load-data-local"/>.
+ <option>--local-infile=0</option>, <literal>LOCAL</literal> does
+ not work. See <xref linkend="load-data-local"/>.
</para>
<para>
@@ -5001,8 +4997,8 @@
<para>
The <literal>REPLACE</literal> and <literal>IGNORE</literal>
- keywords control handling of input records that duplicate
- existing records on unique key values.
+ keywords control handling of input rows that duplicate existing
+ rows on unique key values.
</para>
<para>
@@ -5805,10 +5801,10 @@
<para>
<literal>REPLACE</literal> works exactly like
- <literal>INSERT</literal>, except that if an old record in the
- table has the same value as a new record for a <literal>PRIMARY
- KEY</literal> or a <literal>UNIQUE</literal> index, the old
- record is deleted before the new record is inserted. See
+ <literal>INSERT</literal>, except that if an old row in the
+ table has the same value as a new row for a <literal>PRIMARY
+ KEY</literal> or a <literal>UNIQUE</literal> index, the old row
+ is deleted before the new row is inserted. See
<xref linkend="insert"/>.
</para>
@@ -5817,10 +5813,10 @@
standard. It either inserts, or <emphasis>deletes</emphasis> and
inserts. If you're looking for a statement that follows the SQL
standard, and that either inserts or
- <emphasis>updates</emphasis>, look for the <literal>INSERT
- … ON DUPLICATE KEY UPDATE</literal> statement; see
- <xref linkend="insert"/>. <literal>INSERT … ON DUPLICATE
- KEY UPDATE</literal> is available as of MySQL 4.1.0.
+ <emphasis>updates</emphasis>, look for the <literal>INSERT ...
+ ON DUPLICATE KEY UPDATE</literal> statement; see
+ <xref linkend="insert"/>. <literal>INSERT ... ON DUPLICATE KEY
+ UPDATE</literal> is available as of MySQL 4.1.0.
</para>
<para>
@@ -5849,8 +5845,8 @@
</para>
<para>
- To be able to use <literal>REPLACE</literal>, you must have both
- the <literal>INSERT</literal> and <literal>DELETE</literal>
+ To use <literal>REPLACE</literal>, you must have both the
+ <literal>INSERT</literal> and <literal>DELETE</literal>
privileges for the table.
</para>
@@ -6578,9 +6574,9 @@
<emphasis>must</emphasis> escape any <literal>FIELDS
TERMINATED BY</literal>, <literal>ENCLOSED BY</literal>,
<literal>ESCAPED BY</literal>, or <literal>LINES TERMINATED
- BY</literal> characters to be able to read the file back
- reliably. ASCII <literal>NUL</literal> is escaped to make it
- easier to view with some pagers.
+ BY</literal> characters to read the file back reliably.
+ ASCII <literal>NUL</literal> is escaped to make it easier to
+ view with some pagers.
</para>
<para>
@@ -7004,12 +7000,12 @@
<listitem>
<para>
- If there is no matching record for the right table in the
+ If there is no matching row for the right table in the
<literal>ON</literal> or <literal>USING</literal> part in
a <literal>LEFT JOIN</literal>, a row with all columns set
to <literal>NULL</literal> is used for the right table.
- You can use this fact to find records in a table that have
- no counterpart in another table:
+ You can use this fact to find rows in a table that have no
+ counterpart in another table:
</para>
<remark role="help-example"/>
@@ -7585,7 +7581,7 @@
</para>
<para>
- For example, suppose that we make two tables:
+ Suppose that we make two tables:
</para>
<programlisting>
@@ -7923,7 +7919,7 @@
<title>&title-exists-and-not-exists-subqueries;</title>
<para>
- If a subquery returns any rows at all, then <literal>EXISTS
+ If a subquery returns any rows at all, <literal>EXISTS
<replaceable>subquery</replaceable></literal> is
<literal>TRUE</literal>, and <literal>NOT EXISTS
<replaceable>subquery</replaceable></literal> is
@@ -7946,7 +7942,7 @@
<para>
For the preceding example, if <literal>t2</literal> contains
any rows, even rows with nothing but <literal>NULL</literal>
- values, then the <literal>EXISTS</literal> condition is
+ values, the <literal>EXISTS</literal> condition is
<literal>TRUE</literal>. This is actually an unlikely example
because a <literal>[NOT] EXISTS</literal> subquery almost
always contains correlations. Here are some more realistic
@@ -8284,8 +8280,8 @@
<para>
If <literal>SELECT column1 FROM t2</literal> returns just
one row the previous query will work. If the subquery
- returns more than one row, then error 1242 will occur. In
- that case, the query should be rewritten as:
+ returns more than one row, error 1242 will occur. In that
+ case, the query should be rewritten as:
</para>
<programlisting>
@@ -8664,10 +8660,10 @@
The second option is to use a procedural programming
language (such as Perl or PHP) to submit a
<literal>SELECT</literal> query which obtains the primary
- keys for the records to be deleted, and then use these
- values to construct the appropriate
- <literal>DELETE</literal> statement (<literal>DELETE FROM
- ... WHERE key_col IN (key1, key2,...)</literal>).
+ keys for the rows to be deleted, and then use these values
+ to construct the appropriate <literal>DELETE</literal>
+ statement (<literal>DELETE FROM ... WHERE key_col IN
+ (key1, key2,...)</literal>).
</para>
</listitem>
@@ -8913,7 +8909,7 @@
<para>
<literal>UPDATE</literal> assignments are evaluated from left to
right. For example, the following statement doubles the
- <literal>age</literal> column, then increments it:
+ <literal>age</literal> column, and then increments it:
</para>
<programlisting>
@@ -9714,8 +9710,8 @@
TABLES</literal>, and deadlocks can very easily happen.
Starting from 4.1.9, we do not acquire the
<literal>InnoDB</literal> table lock at all if
- <literal>AUTOCOMMIT=1</literal>, in order to help old
- applications avoid unnecessary deadlocks.
+ <literal>AUTOCOMMIT=1</literal>, to help old applications
+ avoid unnecessary deadlocks.
</para>
</listitem>
@@ -9787,9 +9783,9 @@
</programlisting>
<para>
- If your queries refer to a table using an alias, then you must
- lock the table using that same alias. It does not work to lock
- the table without specifying the alias:
+ If your queries refer to a table using an alias, you must lock
+ the table using that same alias. It does not work to lock the
+ table without specifying the alias:
</para>
<programlisting>
@@ -10133,7 +10129,7 @@
<literal>'jeffrey'@'localhost'</literal>. The user and host
parts of the account name correspond to the
<literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table record for the
+ values of the <literal>user</literal> table row for the
account.
</para>
@@ -10168,8 +10164,8 @@
<para>
Use <literal>REVOKE</literal> to revoke the privileges
displayed by <literal>SHOW GRANTS</literal>. This removes
- records for the account from all the grant tables except
- the <literal>user</literal> table, and revokes any global
+ rows for the account from all the grant tables except the
+ <literal>user</literal> table, and revokes any global
privileges listed in the <literal>user</literal> table.
See <xref linkend="grant"/>.
</para>
@@ -10314,14 +10310,14 @@
</para>
<para>
- If the grant tables hold privilege records that contain
+ If the grant tables hold privilege rows that contain
mixed-case database or table names and the
<literal>lower_case_table_names</literal> system variable is
set, <literal>REVOKE</literal> cannot be used to revoke the
privileges. It will be necessary to manipulate the grant
tables directly. (<literal>GRANT</literal> will not create
- such records when <literal>lower_case_table_names</literal> is
- set, but such records might have been created prior to setting
+ such rows when <literal>lower_case_table_names</literal> is
+ set, but such rows might have been created prior to setting
the variable.)
</para>
@@ -10638,7 +10634,7 @@
<literal>EXECUTE</literal>, and <literal>GRANT
OPTION</literal>. <literal>CREATE ROUTINE</literal> is not a
routine-level privilege because you must have this privilege
- to be able to create a routine in the first place.
+ to create a routine in the first place.
</para>
<para>
@@ -11004,7 +11000,7 @@
The <literal>REQUIRE SSL</literal> option tells the server
to allow only SSL-encrypted connections for the account.
Note that this option can be omitted if there are any
- access-control records that allow non-SSL connections.
+ access-control rows that allow non-SSL connections.
</para>
<programlisting>
@@ -11871,11 +11867,11 @@
deleted a large part of a table or if you have made many
changes to a table with variable-length rows (tables that have
<literal>VARCHAR</literal>, <literal>BLOB</literal>, or
- <literal>TEXT</literal> columns). Deleted records are
- maintained in a linked list and subsequent
- <literal>INSERT</literal> operations reuse old record
- positions. You can use <literal>OPTIMIZE TABLE</literal> to
- reclaim the unused space and to defragment the data file.
+ <literal>TEXT</literal> columns). Deleted rows are maintained
+ in a linked list and subsequent <literal>INSERT</literal>
+ operations reuse old row positions. You can use
+ <literal>OPTIMIZE TABLE</literal> to reclaim the unused space
+ and to defragment the data file.
</para>
<remark role="help-description-end"/>
@@ -12145,7 +12141,7 @@
The backup for each table consists of its
<filename>.frm</filename> format file and
<filename>.MYD</filename> data file. The restore operation
- restores those files, then uses them to rebuild the
+ restores those files, and then uses them to rebuild the
<filename>.MYI</filename> index file. Restoring takes longer
than backing up due to the need to rebuild the indexes. The
more indexes the table has, the longer it takes.
@@ -12925,7 +12921,7 @@
</para>
<para>
- The maximum number of records to return from
+ The maximum number of rows to return from
<literal>SELECT</literal> statements. The default value for
a new connection is <quote>unlimited.</quote> If you have
changed the limit, the default value can be restored by
@@ -13744,7 +13740,7 @@
A <literal>Support</literal> value indicates whether the
particular storage engine is supported, and which is the
default engine. For example, if the server is started with the
- <option>--default-table-type=InnoDB</option> option, then the
+ <option>--default-table-type=InnoDB</option> option, the
<literal>Support</literal> value for the
<literal>InnoDB</literal> row has the value
<literal>DEFAULT</literal>. See
@@ -14718,9 +14714,8 @@
<para>
Means that the thread is flushing the changed table data
to disk and closing the used tables. This should be a fast
- operation. If not, then you should verify that you do not
- have a full disk and that the disk is not in very heavy
- use.
+ operation. If not, you should verify that you do not have
+ a full disk and that the disk is not in very heavy use.
</para>
</listitem>
@@ -15063,9 +15058,9 @@
<para>
The thread got a notification that the underlying
structure for a table has changed and it needs to reopen
- the table to get the new structure. However, to be able to
- reopen the table, it must wait until all other threads
- have closed the table in question.
+ the table to get the new structure. However, to reopen the
+ table, it must wait until all other threads have closed
+ the table in question.
</para>
<para>
@@ -16435,8 +16430,8 @@
<remark role="help-description-end"/>
<para>
- You must have the <literal>RELOAD</literal> privilege in order
- to execute <literal>RESET</literal>.
+ You must have the <literal>RELOAD</literal> privilege to
+ execute <literal>RESET</literal>.
</para>
<para>
@@ -17971,7 +17966,7 @@
replicate <literal>TIMESTAMP</literal> successfully.
However, the drawback for
<literal>Seconds_Behind_Master</literal> is that if M1
- also receives direct updates from clients, then the value
+ also receives direct updates from clients, the value
randomly deviates, because sometimes the last M1's event
is from M0 and sometimes it is from a direct update, and
so is the most recent timestamp.
Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/storage-engines.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -2384,8 +2384,8 @@
the MySQL server starts, you can use the
<option>--init-file</option> option. For example, you can put
statements such as <literal>INSERT INTO ... SELECT</literal>
- or <literal>LOAD DATA INFILE</literal> into this file in order
- to load the table from a persistent data source. See
+ or <literal>LOAD DATA INFILE</literal> into this file to load
+ the table from a persistent data source. See
<xref linkend="server-options"/>, and
<xref linkend="load-data"/>.
</para>
Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-4.1/tutorial.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -2785,9 +2785,9 @@
</programlisting>
<para>
- In this query, we specify aliases for the table name in order
- to refer to the columns and keep straight which instance of
- the table each column reference is associated with.
+ In this query, we specify aliases for the table name to refer
+ to the columns and keep straight which instance of the table
+ each column reference is associated with.
</para>
</section>
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/apis.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -7273,12 +7273,12 @@
5.0.1. MySQL ¤t-series; servers support only one type of
shutdown; <literal>shutdown_level</literal> must be equal to
<literal>SHUTDOWN_DEFAULT</literal>. Additional shutdown
- levels are planned in order to make it possible to choose the
- desired level. Dynamically linked executables which have been
- compiled with older versions of the
- <literal>libmysqlclient</literal> headers and call
- <literal>mysql_shutdown()</literal> need to be used with the
- old <literal>libmysqlclient</literal> dynamic library.
+ levels are planned to make it possible to choose the desired
+ level. Dynamically linked executables which have been compiled
+ with older versions of the <literal>libmysqlclient</literal>
+ headers and call <literal>mysql_shutdown()</literal> need to
+ be used with the old <literal>libmysqlclient</literal> dynamic
+ library.
</para>
<para>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -9059,10 +9059,10 @@
‘<literal>_</literal>’), only those names that are
matched by the wildcard are shown. If a database name contains
any underscores, those should be escaped with a backslash
- (some Unix shells require two) in order to get a list of the
- proper tables or columns. ‘<literal>*</literal>’
- and ‘<literal>?</literal>’ characters are
- converted into SQL ‘<literal>%</literal>’ and
+ (some Unix shells require two) to get a list of the proper
+ tables or columns. ‘<literal>*</literal>’ and
+ ‘<literal>?</literal>’ characters are converted
+ into SQL ‘<literal>%</literal>’ and
‘<literal>_</literal>’ wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a ‘<literal>_</literal>’ in the
Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/connector-odbc.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -1422,8 +1422,8 @@
<title>&title-myodbc-unix-thread-safe;</title>
<para>
- To link the driver with MySQL thread safe client
- libraries <filename>libmysqlclient_r.so</filename> or
+ To link the driver with MySQL thread safe client libraries
+ <filename>libmysqlclient_r.so</filename> or
<filename>libmysqlclient_r.a</filename>, you must specify the
following <command>configure</command> option:
</para>
@@ -2501,8 +2501,7 @@
<para>
<emphasis role="bold">Note</emphasis>: If you are using
- unixODBC, you can use the following tools in order to set up the
- DSN:
+ unixODBC, you can use the following tools to set up the DSN:
</para>
<itemizedlist>
@@ -4294,8 +4293,8 @@
<title>&title-msaccess-setup;</title>
<para>
- The following must be done on your client PC in order to make
- Microsoft Access work with MyODBC.
+ The following must be done on your client PC to make Microsoft
+ Access work with MyODBC.
</para>
<orderedlist>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/data-types.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -3850,14 +3850,14 @@
Before MySQL 5.0.15, trailing 0x00 bytes are removed for
<literal>ORDER BY</literal> operations.)
</para>
-
+
<para>
Note that the <literal>InnoDB</literal> storage engine continues
to preserve trailing spaces in <literal>BINARY</literal> and
<literal>VARBINARY</literal> column values through MySQL 5.0.18,
and then, beginning with MySQL 5.0.19, ignores trailing space
characters in making comparisons as do other MySQL storage
- engines.
+ engines.
</para>
<para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/database-administration.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -10582,11 +10582,11 @@
<listitem>
<para>
You might want to use the <option>--user</option> option
- for <command>mysqld</command>, but in order to do this
- you need to run the <command>mysqld_multi</command>
- script as the Unix <literal>root</literal> user. Having
- the option in the option file doesn't matter; you just
- get a warning if you are not the superuser and the
+ for <command>mysqld</command>, but to do this you need
+ to run the <command>mysqld_multi</command> script as the
+ Unix <literal>root</literal> user. Having the option in
+ the option file doesn't matter; you just get a warning
+ if you are not the superuser and the
<command>mysqld</command> processes are started under
your own Unix account.
</para>
@@ -10741,8 +10741,8 @@
version 5.0.4, the init startup script uses the old scheme
(invoking <command>mysqld_safe</command>) by default, but one
can set the <literal>use_mysqld_safe</literal> variable in the
- script to <literal>0</literal> (zero) in order to use the
- MySQL Instance Manager to start a server.
+ script to <literal>0</literal> (zero) to use the MySQL
+ Instance Manager to start a server.
</para>
<remark role="todo">
@@ -18060,10 +18060,10 @@
<para>
Note that yaSSL support on Unix platforms requires that either
<filename>/dev/urandom</filename> or
- <filename>/dev/random</filename> be installed in order to
- retrieve true random numbers. For additional information
- (especially regarding yaSSL on Solaris versions prior to 2.8
- and HP-UX), see Bug #13164.
+ <filename>/dev/random</filename> be installed to retrieve true
+ random numbers. For additional information (especially
+ regarding yaSSL on Solaris versions prior to 2.8 and HP-UX),
+ see Bug #13164.
</para>
<para>
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/innodb.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -171,15 +171,15 @@
recovery capabilities. <emphasis role="bold">However, it cannot do
so</emphasis> if the underlying operating system or hardware does
not work as advertised. Many operating systems or disk subsystems
- may delay or reorder write operations in order to improve
- performance. On some operating systems, the very system call that
- should wait until all unwritten data for a file has been flushed
- — <literal>fsync()</literal> — might actually return
- before the data has been flushed to stable storage. Because of
- this, an operating system crash or a power outage may destroy
- recently committed data, or in the worst case, even corrupt the
- database because of write operations having been reordered. If
- data integrity is important to you, you should perform some
+ may delay or reorder write operations to improve performance. On
+ some operating systems, the very system call that should wait
+ until all unwritten data for a file has been flushed —
+ <literal>fsync()</literal> — might actually return before
+ the data has been flushed to stable storage. Because of this, an
+ operating system crash or a power outage may destroy recently
+ committed data, or in the worst case, even corrupt the database
+ because of write operations having been reordered. If data
+ integrity is important to you, you should perform some
<quote>pull-the-plug</quote> tests before using anything in
production. On Mac OS X 10.3 and up, <literal>InnoDB</literal>
uses a special <literal>fcntl()</literal> file flush method. Under
@@ -5253,11 +5253,11 @@
<para>
<literal>InnoDB</literal> sends diagnostic output to
<literal>stderr</literal> or to files rather than to
- <literal>stdout</literal> or fixed-size memory buffers, in order
- to avoid potential buffer overflows. As a side effect, the
- output of <literal>SHOW ENGINE INNODB STATUS</literal> is
- written to a status file in the MySQL data directory every
- fifteen seconds. The name of the file is
+ <literal>stdout</literal> or fixed-size memory buffers, to avoid
+ potential buffer overflows. As a side effect, the output of
+ <literal>SHOW ENGINE INNODB STATUS</literal> is written to a
+ status file in the MySQL data directory every fifteen seconds.
+ The name of the file is
<filename>innodb_status.<replaceable>pid</replaceable></filename>,
where <replaceable>pid</replaceable> is the server process ID.
<literal>InnoDB</literal> removes the file for a normal
@@ -7094,7 +7094,7 @@
actions.
</para>
</listitem>
-
+
<listitem>
<para>
Prior to MySQL 5.0.19, <literal>InnoDB</literal> does not
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/installing.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -14806,10 +14806,10 @@
<para>
For older versions of FreeBSD, you must recompile your kernel
- in order to change the maximum data segment size for a
- process. In this case, you should look at the
- <literal>MAXDSIZ</literal> option in the
- <literal>LINT</literal> config file for more information.
+ to change the maximum data segment size for a process. In this
+ case, you should look at the <literal>MAXDSIZ</literal> option
+ in the <literal>LINT</literal> config file for more
+ information.
</para>
<para>
Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/optimization.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -720,7 +720,7 @@
<para>
With the help of <literal>EXPLAIN</literal>, you can see where
- you should add indexes to tables in order to get a faster
+ you should add indexes to tables to get a faster
<literal>SELECT</literal> that uses indexes to find rows. You
can also use <literal>EXPLAIN</literal> to check whether the
optimizer joins the tables in an optimal order. To force the
@@ -2939,7 +2939,7 @@
(<replaceable>x</replaceable> OR <replaceable>y</replaceable>) AND <replaceable>z</replaceable> = (<replaceable>x</replaceable> AND <replaceable>z</replaceable>) OR (<replaceable>y</replaceable> AND <replaceable>z</replaceable>)
</programlisting>
</listitem>
-
+
<listitem>
<para>
Index Merge is not applicable to fulltext indexes. We plan
@@ -5650,8 +5650,8 @@
(observing what is referred to in database theory as
<firstterm>third normal form</firstterm>). However, there
may be situations in which it can be advantageous to
- duplicate information or create summary tables in order to
- gain more speed.
+ duplicate information or create summary tables to gain more
+ speed.
</para>
</listitem>
@@ -6653,7 +6653,7 @@
× <replaceable>N</replaceable> bytes for these columns
by stripping trailing spaces if necessary. The minimum
storage length is kept as <replaceable>N</replaceable> bytes
- in order to facilitate in-place updates in typical cases.
+ to facilitate in-place updates in typical cases.
</para>
</listitem>
@@ -8236,8 +8236,7 @@
<literal>table_cache</literal> entries. The default value is 64;
this can be changed with the <option>--table_cache</option>
option to <command>mysqld</command>. Note that MySQL may
- temporarily open more tables than this in order to execute
- queries.
+ temporarily open more tables than this to execute queries.
</para>
<para>
@@ -8889,8 +8888,8 @@
<para>
The <literal>optimizer_search_depth</literal> variable tells
how far into the <quote>future</quote> of each incomplete
- plan the optimizer should look in order to evaluate whether
- it should be expanded further. Smaller values of
+ plan the optimizer should look to evaluate whether it should
+ be expanded further. Smaller values of
<literal>optimizer_search_depth</literal> may result in
orders of magnitude smaller query compilation times. For
example, queries with 12, 13, or more tables may easily
Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/problems.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -763,8 +763,8 @@
<literal>mysqli</literal> extension (stands for "MySQL,
Improved"; added in PHP 5) is compatible with the improved
password hashing employed in MySQL 4.1 and higher, and no
- special configuration of MySQL need be done in order to use this
- MySQL client library. For more information about the
+ special configuration of MySQL need be done to use this MySQL
+ client library. For more information about the
<literal>mysqli</literal> extension, see
<ulink url="http://php.net/mysqli"/>.
</para>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/replication.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -223,8 +223,8 @@
Dump</literal> thread sends and copies this data to local files,
known as <emphasis>relay logs</emphasis>, in the slave's data
directory. The third thread is the SQL thread, which the slave
- creates in order to read the relay logs and to execute the updates
- they contain.
+ creates to read the relay logs and to execute the updates they
+ contain.
</para>
<para>
Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/restrictions.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -811,10 +811,10 @@
updatable in practice. This includes views that have
<literal>UNION</literal> in their definition. Currently, not all
views that are theoretically updatable can be updated. The initial
- view implementation was deliberately written this way in order to
- get usable, updatable views into MySQL as quickly as possible.
- Many theoretically updatable views can be updated now, but
- limitations still exist:
+ view implementation was deliberately written this way to get
+ usable, updatable views into MySQL as quickly as possible. Many
+ theoretically updatable views can be updated now, but limitations
+ still exist:
</para>
<itemizedlist>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -213,8 +213,8 @@
and then the original table is deleted and the new one is
renamed. While <literal>ALTER TABLE</literal> is executing, the
original table is readable by other clients. Updates and writes
- to the table are stalled until the new table is ready, then are
- automatically redirected to the new table without any failed
+ to the table are stalled until the new table is ready, and then
+ are automatically redirected to the new table without any failed
updates.
</para>
@@ -478,12 +478,11 @@
<literal>DROP PRIMARY KEY</literal> drops the primary index.
<emphasis>Note</emphasis>: In older versions of MySQL, if no
- primary index existed, then <literal>DROP PRIMARY
- KEY</literal> would drop the first <literal>UNIQUE</literal>
- index in the table. This is not the case in MySQL
- ¤t-series;, where trying to use <literal>DROP PRIMARY
- KEY</literal> on a table with no primary key will give rise
- to an error.
+ primary index existed, <literal>DROP PRIMARY KEY</literal>
+ would drop the first <literal>UNIQUE</literal> index in the
+ table. This is not the case in MySQL ¤t-series;, where
+ trying to use <literal>DROP PRIMARY KEY</literal> on a table
+ with no primary key will give rise to an error.
</para>
<indexterm type="function">
@@ -729,8 +728,8 @@
<para>
To import the backup <filename>.ibd</filename> file back
- into the table, copy it into the database directory, then
- issue this statement:
+ into the table, copy it into the database directory, and
+ then issue this statement:
</para>
<programlisting>
@@ -749,8 +748,8 @@
</indexterm>
With the <literal>mysql_info()</literal> C API function, you
- can find out how many records were copied, and (when
- <literal>IGNORE</literal> is used) how many records were
+ can find out how many rows were copied, and (when
+ <literal>IGNORE</literal> is used) how many rows were
deleted due to duplication of unique key values. See
<xref linkend="mysql-info"/>.
</para>
@@ -1357,7 +1356,7 @@
non-<literal>TEMPORARY</literal> table of the same name. (The
existing table is hidden until the temporary table is dropped.)
You must have the <literal>CREATE TEMPORARY TABLES</literal>
- privilege to be able to create temporary tables.
+ privilege to create temporary tables.
</para>
<para>
@@ -1367,7 +1366,7 @@
to that indicated by the <literal>CREATE TABLE</literal>
statement. <emphasis>Note</emphasis>: If you use <literal>IF NOT
EXISTS</literal> in a <literal>CREATE TABLE ... SELECT</literal>
- statement, any records selected by the <literal>SELECT</literal>
+ statement, any rows selected by the <literal>SELECT</literal>
part are inserted whether or not the table already exists.
</para>
@@ -2021,8 +2020,8 @@
<para>
For <literal>MyISAM</literal> tables, each
<literal>NULL</literal> column takes one bit extra, rounded
- up to the nearest byte. The maximum record length in bytes
- can be calculated as follows:
+ up to the nearest byte. The maximum row length in bytes can
+ be calculated as follows:
</para>
<programlisting>
@@ -2034,11 +2033,10 @@
<para>
<replaceable>delete_flag</replaceable> is 1 for tables with
- static record format. Static tables use a bit in the row
- record for a flag that indicates whether the row has been
- deleted. <replaceable>delete_flag</replaceable> is 0 for
- dynamic tables because the flag is stored in the dynamic row
- header.
+ static row format. Static tables use a bit in the row record
+ for a flag that indicates whether the row has been deleted.
+ <replaceable>delete_flag</replaceable> is 0 for dynamic
+ tables because the flag is stored in the dynamic row header.
</para>
<para>
@@ -2204,7 +2202,7 @@
<para>
An approximation of the average row length for your table.
You need to set this only for large tables with
- variable-size records.
+ variable-size rows.
</para>
<para>
@@ -2417,7 +2415,7 @@
<para>
Starting with MySQL/InnoDB-5.0.3, <literal>InnoDB</literal>
- records are stored in compact format
+ rows are stored in compact format
(<literal>ROW_FORMAT=COMPACT</literal>) by default. The
non-compact format used in older versions of MySQL can still
be requested by specifying
@@ -2649,13 +2647,13 @@
<para>
You can precede the <literal>SELECT</literal> by
<literal>IGNORE</literal> or <literal>REPLACE</literal> to
- indicate how to handle records that duplicate unique key values.
- With <literal>IGNORE</literal>, new records that duplicate an
- existing record on a unique key value are discarded. With
- <literal>REPLACE</literal>, new records replace records that
- have the same unique key value. If neither
- <literal>IGNORE</literal> nor <literal>REPLACE</literal> is
- specified, duplicate unique key values result in an error.
+ indicate how to handle rows that duplicate unique key values.
+ With <literal>IGNORE</literal>, new rows that duplicate an
+ existing row on a unique key value are discarded. With
+ <literal>REPLACE</literal>, new rows replace rows that have the
+ same unique key value. If neither <literal>IGNORE</literal> nor
+ <literal>REPLACE</literal> is specified, duplicate unique key
+ values result in an error.
</para>
<para>
@@ -3286,7 +3284,7 @@
<literal>DELETE</literal> deletes rows from
<replaceable>tbl_name</replaceable> that satisfy the condition
given by <replaceable>where_definition</replaceable>, and
- returns the number of records deleted.
+ returns the number of rows deleted.
</para>
<para>
@@ -3365,14 +3363,13 @@
</para>
<para>
- In <literal>MyISAM</literal> tables, deleted records are
- maintained in a linked list and subsequent
- <literal>INSERT</literal> operations reuse old record positions.
- To reclaim unused space and reduce file sizes, use the
- <literal>OPTIMIZE TABLE</literal> statement or the
- <command>myisamchk</command> utility to reorganize tables.
- <literal>OPTIMIZE TABLE</literal> is easier, but
- <command>myisamchk</command> is faster. See
+ In <literal>MyISAM</literal> tables, deleted rows are maintained
+ in a linked list and subsequent <literal>INSERT</literal>
+ operations reuse old row positions. To reclaim unused space and
+ reduce file sizes, use the <literal>OPTIMIZE TABLE</literal>
+ statement or the <command>myisamchk</command> utility to
+ reorganize tables. <literal>OPTIMIZE TABLE</literal> is easier,
+ but <command>myisamchk</command> is faster. See
<xref linkend="optimize-table"/>, and
<xref linkend="optimization"/>.
</para>
@@ -3406,14 +3403,14 @@
<listitem>
<para>
- Insert many records into the table. Each insert results in
- an index value that is added to the high end of the index.
+ Insert many rows into the table. Each insert results in an
+ index value that is added to the high end of the index.
</para>
</listitem>
<listitem>
<para>
- Delete a block of records at the low end of the column range
+ Delete a block of rows at the low end of the column range
using <literal>DELETE QUICK</literal>.
</para>
</listitem>
@@ -3424,9 +3421,9 @@
In this scenario, the index blocks associated with the deleted
index values become underfilled but are not merged with other
index blocks due to the use of <literal>QUICK</literal>. They
- remain underfilled when new inserts occur, because new records
- does not have index values in the deleted range. Furthermore,
- they remain underfilled even if you later use
+ remain underfilled when new inserts occur, because new rows does
+ not have index values in the deleted range. Furthermore, they
+ remain underfilled even if you later use
<literal>DELETE</literal> without <literal>QUICK</literal>,
unless some of the deleted index values happen to lie in index
blocks within or adjacent to the underfilled blocks. To reclaim
@@ -4133,8 +4130,8 @@
</programlisting>
<para>
- The rows-affected value is 1 if the row is inserted as a new
- record and 2 if an existing record is updated.
+ The rows-affected value is 1 if the row is inserted as a new row
+ and 2 if an existing row is updated.
</para>
<para>
@@ -4364,7 +4361,7 @@
<listitem>
<para>
Specify <literal>IGNORE</literal> explicitly to ignore
- records that would cause duplicate-key violations.
+ rows that would cause duplicate-key violations.
</para>
</listitem>
@@ -4611,7 +4608,7 @@
<listitem>
<para>
The client cannot obtain from the server the number of
- duplicate records or the <literal>AUTO_INCREMENT</literal>
+ duplicate rows or the <literal>AUTO_INCREMENT</literal>
value for the resulting row, because the
<literal>INSERT</literal> returns before the insert
operation has been completed. (If you use the C API, the
@@ -4838,11 +4835,10 @@
If you specify <literal>CONCURRENT</literal> with a
<literal>MyISAM</literal> table that satisfies the condition for
concurrent inserts (that is, it contains no free blocks in the
- middle), then other threads can retrieve data from the table
- while <literal>LOAD DATA</literal> is executing. Using this
- option affects the performance of <literal>LOAD DATA</literal> a
- bit, even if no other thread is using the table at the same
- time.
+ middle), other threads can retrieve data from the table while
+ <literal>LOAD DATA</literal> is executing. Using this option
+ affects the performance of <literal>LOAD DATA</literal> a bit,
+ even if no other thread is using the table at the same time.
</para>
<para>
@@ -4955,8 +4951,8 @@
<literal>LOCAL</literal> works only if your server and your
client both have been enabled to allow it. For example, if
<command>mysqld</command> was started with
- <option>--local-infile=0</option>, then <literal>LOCAL</literal>
- does not work. See <xref linkend="load-data-local"/>.
+ <option>--local-infile=0</option>, <literal>LOCAL</literal> does
+ not work. See <xref linkend="load-data-local"/>.
</para>
<para>
@@ -4974,8 +4970,8 @@
<para>
The <literal>REPLACE</literal> and <literal>IGNORE</literal>
- keywords control handling of input records that duplicate
- existing records on unique key values.
+ keywords control handling of input rows that duplicate existing
+ rows on unique key values.
</para>
<para>
@@ -5873,10 +5869,10 @@
<para>
<literal>REPLACE</literal> works exactly like
- <literal>INSERT</literal>, except that if an old record in the
- table has the same value as a new record for a <literal>PRIMARY
- KEY</literal> or a <literal>UNIQUE</literal> index, the old
- record is deleted before the new record is inserted. See
+ <literal>INSERT</literal>, except that if an old row in the
+ table has the same value as a new row for a <literal>PRIMARY
+ KEY</literal> or a <literal>UNIQUE</literal> index, the old row
+ is deleted before the new row is inserted. See
<xref linkend="insert"/>.
</para>
@@ -5885,8 +5881,8 @@
standard. It either inserts, or <emphasis>deletes</emphasis> and
inserts. If you're looking for a statement that follows the SQL
standard, and that either inserts or
- <emphasis>updates</emphasis>, look for the <literal>INSERT
- … ON DUPLICATE KEY UPDATE</literal> statement; see
+ <emphasis>updates</emphasis>, look for the <literal>INSERT ...
+ ON DUPLICATE KEY UPDATE</literal> statement; see
<xref linkend="insert"/>.
</para>
@@ -5916,8 +5912,8 @@
</para>
<para>
- To be able to use <literal>REPLACE</literal>, you must have both
- the <literal>INSERT</literal> and <literal>DELETE</literal>
+ To use <literal>REPLACE</literal>, you must have both the
+ <literal>INSERT</literal> and <literal>DELETE</literal>
privileges for the table.
</para>
@@ -6671,9 +6667,9 @@
<emphasis>must</emphasis> escape any <literal>FIELDS
TERMINATED BY</literal>, <literal>ENCLOSED BY</literal>,
<literal>ESCAPED BY</literal>, or <literal>LINES TERMINATED
- BY</literal> characters to be able to read the file back
- reliably. ASCII <literal>NUL</literal> is escaped to make it
- easier to view with some pagers.
+ BY</literal> characters to read the file back reliably.
+ ASCII <literal>NUL</literal> is escaped to make it easier to
+ view with some pagers.
</para>
<para>
@@ -7001,7 +6997,7 @@
<programlisting>
<replaceable>table_references:</replaceable>
- <replaceable>table_reference</replaceable> [, <replaceable>table_reference</replaceable>] …
+ <replaceable>table_reference</replaceable> [, <replaceable>table_reference</replaceable>] ...
<replaceable>table_reference</replaceable>:
<replaceable>table_factor</replaceable>
@@ -7138,12 +7134,12 @@
<listitem>
<para>
- If there is no matching record for the right table in the
+ If there is no matching row for the right table in the
<literal>ON</literal> or <literal>USING</literal> part in
a <literal>LEFT JOIN</literal>, a row with all columns set
to <literal>NULL</literal> is used for the right table.
- You can use this fact to find records in a table that have
- no counterpart in another table:
+ You can use this fact to find rows in a table that have no
+ counterpart in another table:
</para>
<remark role="help-example"/>
@@ -7451,7 +7447,7 @@
</para>
<programlisting>
-SELECT … FROM t1 NATURAL JOIN t2 NATURAL JOIN t3;
+SELECT ... FROM t1 NATURAL JOIN t2 NATURAL JOIN t3;
</programlisting>
<para>
@@ -7468,7 +7464,7 @@
</para>
<programlisting>
-SELECT … FROM t1, t2, t3
+SELECT ... FROM t1, t2, t3
WHERE t1.b = t2.b AND t2.c = t3.c;
</programlisting>
@@ -7480,7 +7476,7 @@
</para>
<programlisting>
-SELECT … FROM t1, t2, t3
+SELECT ... FROM t1, t2, t3
WHERE t1.b = t2.b AND t2.c = t3.c AND t1.a = t3.a;
</programlisting>
@@ -8026,7 +8022,7 @@
</para>
<para>
- For example, suppose that we make two tables:
+ Suppose that we make two tables:
</para>
<programlisting>
@@ -8364,7 +8360,7 @@
<title>&title-exists-and-not-exists-subqueries;</title>
<para>
- If a subquery returns any rows at all, then <literal>EXISTS
+ If a subquery returns any rows at all, <literal>EXISTS
<replaceable>subquery</replaceable></literal> is
<literal>TRUE</literal>, and <literal>NOT EXISTS
<replaceable>subquery</replaceable></literal> is
@@ -8387,7 +8383,7 @@
<para>
For the preceding example, if <literal>t2</literal> contains
any rows, even rows with nothing but <literal>NULL</literal>
- values, then the <literal>EXISTS</literal> condition is
+ values, the <literal>EXISTS</literal> condition is
<literal>TRUE</literal>. This is actually an unlikely example
because a <literal>[NOT] EXISTS</literal> subquery almost
always contains correlations. Here are some more realistic
@@ -8703,8 +8699,8 @@
<para>
If <literal>SELECT column1 FROM t2</literal> returns just
one row the previous query will work. If the subquery
- returns more than one row, then error 1242 will occur. In
- that case, the query should be rewritten as:
+ returns more than one row, error 1242 will occur. In that
+ case, the query should be rewritten as:
</para>
<programlisting>
@@ -9100,7 +9096,7 @@
<listitem><para>
The second option is to use a procedural programming language
(such as Perl or PHP) to submit a <literal>SELECT</literal> query
- to obtain the primary keys for the records to be deleted, and then
+ to obtain the primary keys for the rows to be deleted, and then
use these values to construct the <literal>DELETE</literal>
statement (<literal>DELETE FROM ... WHERE key_col IN (key1, key2,
...)</literal>).
@@ -9344,7 +9340,7 @@
<para>
<literal>UPDATE</literal> assignments are evaluated from left to
right. For example, the following statement doubles the
- <literal>age</literal> column, then increments it:
+ <literal>age</literal> column, and then increments it:
</para>
<programlisting>
@@ -10193,8 +10189,8 @@
immediately after the call of <literal>LOCK
TABLES</literal>, and deadlocks can very easily happen. Note
that we do not acquire the <literal>InnoDB</literal> table
- lock at all if <literal>AUTOCOMMIT=1</literal>, in order to
- help old applications avoid unnecessary deadlocks.
+ lock at all if <literal>AUTOCOMMIT=1</literal>, to help old
+ applications avoid unnecessary deadlocks.
</para>
</listitem>
@@ -10263,9 +10259,9 @@
</programlisting>
<para>
- If your queries refer to a table using an alias, then you must
- lock the table using that same alias. It does not work to lock
- the table without specifying the alias:
+ If your queries refer to a table using an alias, you must lock
+ the table using that same alias. It does not work to lock the
+ table without specifying the alias:
</para>
<programlisting>
@@ -11023,8 +11019,7 @@
<para>
For an <literal>IDLE</literal> XA transaction, you can
issue either an <literal>XA PREPARE</literal> statement or
- an <literal>XA COMMIT … ONE PHASE</literal>
- statement:
+ an <literal>XA COMMIT ... ONE PHASE</literal> statement:
</para>
<itemizedlist>
@@ -11043,8 +11038,8 @@
<listitem>
<para>
- <literal>XA COMMIT … ONE PHASE</literal>
- prepares and commits the transaction. The
+ <literal>XA COMMIT ... ONE PHASE</literal> prepares
+ and commits the transaction. The
<replaceable>xid</replaceable> value will not be
listed by <literal>XA RECOVER</literal> because the
transaction terminates.
@@ -11245,7 +11240,7 @@
<literal>'jeffrey'@'localhost'</literal>. The user and host
parts of the account name correspond to the
<literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table record for the
+ values of the <literal>user</literal> table row for the
account.
</para>
@@ -11267,8 +11262,8 @@
</programlisting>
<para>
- The statement removes privilege records for the account from
- all grant tables.
+ The statement removes privilege rows for the account from all
+ grant tables.
</para>
<remark role="help-description-end"/>
@@ -11297,8 +11292,8 @@
<para>
Use <literal>REVOKE</literal> to revoke the privileges
displayed by <literal>SHOW GRANTS</literal>. This removes
- records for the account from all the grant tables except
- the <literal>user</literal> table, and revokes any global
+ rows for the account from all the grant tables except the
+ <literal>user</literal> table, and revokes any global
privileges listed in the <literal>user</literal> table.
See <xref linkend="grant"/>.
</para>
@@ -11433,14 +11428,14 @@
</para>
<para>
- If the grant tables hold privilege records that contain
+ If the grant tables hold privilege rows that contain
mixed-case database or table names and the
<literal>lower_case_table_names</literal> system variable is
set, <literal>REVOKE</literal> cannot be used to revoke the
privileges. It will be necessary to manipulate the grant
tables directly. (<literal>GRANT</literal> will not create
- such records when <literal>lower_case_table_names</literal> is
- set, but such records might have been created prior to setting
+ such rows when <literal>lower_case_table_names</literal> is
+ set, but such rows might have been created prior to setting
the variable.)
</para>
@@ -11786,7 +11781,7 @@
<literal>EXECUTE</literal>, and <literal>GRANT
OPTION</literal>. <literal>CREATE ROUTINE</literal> is not a
routine-level privilege because you must have this privilege
- to be able to create a routine in the first place.
+ to create a routine in the first place.
</para>
<para>
@@ -12171,7 +12166,7 @@
The <literal>REQUIRE SSL</literal> option tells the server
to allow only SSL-encrypted connections for the account.
Note that this option can be omitted if there are any
- access-control records that allow non-SSL connections.
+ access-control rows that allow non-SSL connections.
</para>
<programlisting>
@@ -13107,11 +13102,11 @@
deleted a large part of a table or if you have made many
changes to a table with variable-length rows (tables that have
<literal>VARCHAR</literal>, <literal>BLOB</literal>, or
- <literal>TEXT</literal> columns). Deleted records are
- maintained in a linked list and subsequent
- <literal>INSERT</literal> operations reuse old record
- positions. You can use <literal>OPTIMIZE TABLE</literal> to
- reclaim the unused space and to defragment the data file.
+ <literal>TEXT</literal> columns). Deleted rows are maintained
+ in a linked list and subsequent <literal>INSERT</literal>
+ operations reuse old row positions. You can use
+ <literal>OPTIMIZE TABLE</literal> to reclaim the unused space
+ and to defragment the data file.
</para>
<remark role="help-description-end"/>
@@ -13378,7 +13373,7 @@
The backup for each table consists of its
<filename>.frm</filename> format file and
<filename>.MYD</filename> data file. The restore operation
- restores those files, then uses them to rebuild the
+ restores those files, and then uses them to rebuild the
<filename>.MYI</filename> index file. Restoring takes longer
than backing up due to the need to rebuild the indexes. The
more indexes the table has, the longer it takes.
@@ -14185,7 +14180,7 @@
</para>
<para>
- The maximum number of records to return from
+ The maximum number of rows to return from
<literal>SELECT</literal> statements. The default value for
a new connection is <quote>unlimited.</quote> If you have
changed the limit, the default value can be restored by
@@ -15056,7 +15051,7 @@
A <literal>Support</literal> value indicates whether the
particular storage engine is supported, and which is the
default engine. For example, if the server is started with the
- <option>--default-table-type=InnoDB</option> option, then the
+ <option>--default-table-type=InnoDB</option> option, the
<literal>Support</literal> value for the
<literal>InnoDB</literal> row has the value
<literal>DEFAULT</literal>. See
@@ -16016,9 +16011,8 @@
<para>
Means that the thread is flushing the changed table data
to disk and closing the used tables. This should be a fast
- operation. If not, then you should verify that you do not
- have a full disk and that the disk is not in very heavy
- use.
+ operation. If not, you should verify that you do not have
+ a full disk and that the disk is not in very heavy use.
</para>
</listitem>
@@ -16361,9 +16355,9 @@
<para>
The thread got a notification that the underlying
structure for a table has changed and it needs to reopen
- the table to get the new structure. However, to be able to
- reopen the table, it must wait until all other threads
- have closed the table in question.
+ the table to get the new structure. However, to reopen the
+ table, it must wait until all other threads have closed
+ the table in question.
</para>
<para>
@@ -16996,8 +16990,8 @@
</itemizedlist>
<para>
- You must have the <literal>SUPER</literal> privilege in order
- to execute <literal>SHOW TRIGGERS</literal>.
+ You must have the <literal>SUPER</literal> privilege to
+ execute <literal>SHOW TRIGGERS</literal>.
</para>
<para>
@@ -17961,8 +17955,8 @@
<remark role="help-description-end"/>
<para>
- You must have the <literal>RELOAD</literal> privilege in order
- to execute <literal>RESET</literal>.
+ You must have the <literal>RELOAD</literal> privilege to
+ execute <literal>RESET</literal>.
</para>
<para>
@@ -19447,7 +19441,7 @@
replicate <literal>TIMESTAMP</literal> successfully.
However, the drawback for
<literal>Seconds_Behind_Master</literal> is that if M1
- also receives direct updates from clients, then the value
+ also receives direct updates from clients, the value
randomly deviates, because sometimes the last M1's event
is from M0 and sometimes it is from a direct update, and
so is the most recent timestamp.
Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/storage-engines.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -2339,8 +2339,8 @@
the MySQL server starts, you can use the
<option>--init-file</option> option. For example, you can put
statements such as <literal>INSERT INTO ... SELECT</literal>
- or <literal>LOAD DATA INFILE</literal> into this file in order
- to load the table from a persistent data source. See
+ or <literal>LOAD DATA INFILE</literal> into this file to load
+ the table from a persistent data source. See
<xref linkend="server-options"/>, and
<xref linkend="load-data"/>.
</para>
Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.0/tutorial.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -145,26 +145,26 @@
The <literal>mysql></literal> prompt tells you that
<command>mysql</command> is ready for you to enter commands.
</para>
-
+
<para>
If you are logging in on the same machine that MySQL is running
on, you can omit the host, and simply use the following:
</para>
-
+
<programlisting>
shell< <userinput>mysql -u <replaceable>user</replaceable> -p</userinput>
</programlisting>
-
+
<para>
If, when you attempt to log in, you get an error message such as
<errortext>ERROR 2002 (HY000): Can't connect to local MySQL server
- through socket '/tmp/mysql.sock' (2)</errortext>, it means that
+ through socket '/tmp/mysql.sock' (2)</errortext>, it means that
that MySQL server daemon (Unix) or service (Windows) is not
- running. Consult the administrator or see the section of
+ running. Consult the administrator or see the section of
<xref linkend="installing"/> that is appropriate to your operating
system.
</para>
-
+
<para>
For help with other problems often encountered when trying to log
in, see <xref linkend="common-errors"/>.
@@ -762,17 +762,17 @@
recommended best practice is always to use the same lettercase
that was used when the database was created.)
</para>
-
+
<para>
<emphasis role="bold">Note</emphasis>: If you get an error such
as <errortext>ERROR 1044 (42000): Access denied for user
- 'monty'@'localhost' to database 'menagerie'</errortext> when
+ 'monty'@'localhost' to database 'menagerie'</errortext> when
attempting to create a database, this means that your user
account does not have the necessary privileges to do so. Discuss
- this with the administrator or see
+ this with the administrator or see
<xref linkend="privilege-system"/>.
</para>
-
+
<para>
Creating a database does not select it for use; you must do that
explicitly. To make <literal>menagerie</literal> the current
@@ -2037,10 +2037,10 @@
assume that it is not possible to insert a zero or an empty
string into a column defined as <literal>NOT NULL</literal>,
but this is not the case. These are in fact values, whereas
- <literal>NULL</literal> means <quote>not having a value.</quote> You can
- test this easily enough by using <literal>IS
- </literal>[<literal>NOT</literal>]<literal> NULL</literal> as
- shown:
+ <literal>NULL</literal> means <quote>not having a
+ value.</quote> You can test this easily enough by using
+ <literal>IS </literal>[<literal>NOT</literal>]<literal>
+ NULL</literal> as shown:
</para>
<programlisting>
@@ -2771,9 +2771,9 @@
</programlisting>
<para>
- In this query, we specify aliases for the table name in order
- to refer to the columns and keep straight which instance of
- the table each column reference is associated with.
+ In this query, we specify aliases for the table name to refer
+ to the columns and keep straight which instance of the table
+ each column reference is associated with.
</para>
</section>
@@ -3466,9 +3466,9 @@
<para>
The use of <literal>REFERENCES</literal> in this way as a
- comment or <quote>reminder</quote> in a column definition works with both
- <literal>MyISAM</literal> and <literal>BerkeleyDB</literal>
- tables.
+ comment or <quote>reminder</quote> in a column definition works
+ with both <literal>MyISAM</literal> and
+ <literal>BerkeleyDB</literal> tables.
</para>
</section>
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/apis.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -7275,12 +7275,12 @@
¤t-series; servers support only one type of shutdown;
<literal>shutdown_level</literal> must be equal to
<literal>SHUTDOWN_DEFAULT</literal>. Additional shutdown
- levels are planned in order to make it possible to choose the
- desired level. Dynamically linked executables which have been
- compiled with older versions of the
- <literal>libmysqlclient</literal> headers and call
- <literal>mysql_shutdown()</literal> need to be used with the
- old <literal>libmysqlclient</literal> dynamic library.
+ levels are planned to make it possible to choose the desired
+ level. Dynamically linked executables which have been compiled
+ with older versions of the <literal>libmysqlclient</literal>
+ headers and call <literal>mysql_shutdown()</literal> need to
+ be used with the old <literal>libmysqlclient</literal> dynamic
+ library.
</para>
<para>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -9095,10 +9095,10 @@
‘<literal>_</literal>’), only those names that are
matched by the wildcard are shown. If a database name contains
any underscores, those should be escaped with a backslash
- (some Unix shells require two) in order to get a list of the
- proper tables or columns. ‘<literal>*</literal>’
- and ‘<literal>?</literal>’ characters are
- converted into SQL ‘<literal>%</literal>’ and
+ (some Unix shells require two) to get a list of the proper
+ tables or columns. ‘<literal>*</literal>’ and
+ ‘<literal>?</literal>’ characters are converted
+ into SQL ‘<literal>%</literal>’ and
‘<literal>_</literal>’ wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a ‘<literal>_</literal>’ in the
Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/connector-odbc.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -1422,8 +1422,8 @@
<title>&title-myodbc-unix-thread-safe;</title>
<para>
- To link the driver with MySQL thread safe client
- libraries <filename>libmysqlclient_r.so</filename> or
+ To link the driver with MySQL thread safe client libraries
+ <filename>libmysqlclient_r.so</filename> or
<filename>libmysqlclient_r.a</filename>, you must specify the
following <command>configure</command> option:
</para>
@@ -2501,8 +2501,7 @@
<para>
<emphasis role="bold">Note</emphasis>: If you are using
- unixODBC, you can use the following tools in order to set up the
- DSN:
+ unixODBC, you can use the following tools to set up the DSN:
</para>
<itemizedlist>
@@ -4294,8 +4293,8 @@
<title>&title-msaccess-setup;</title>
<para>
- The following must be done on your client PC in order to make
- Microsoft Access work with MyODBC.
+ The following must be done on your client PC to make Microsoft
+ Access work with MyODBC.
</para>
<orderedlist>
Modified: trunk/refman-5.1/custom-engine.xml
===================================================================
--- trunk/refman-5.1/custom-engine.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/custom-engine.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -34,7 +34,7 @@
storage engine for the new pluggable storage engine architecture.
</para>
- <!--<para>
+<!--<para>
For more information on the MySQL pluggable storage engine
architecture, see <xref linkend="pluggable-storage"/>.
</para>-->
@@ -1876,8 +1876,8 @@
<literal>*key</literal> that identifies the index entry to be
read in a standard format. Your storage engine will need to
extract the information stored in the key and translate it into
- its internal index format in order to identify the row
- associated with the index.
+ its internal index format to identify the row associated with
+ the index.
</para>
<para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/database-administration.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -10642,11 +10642,11 @@
<listitem>
<para>
You might want to use the <option>--user</option> option
- for <command>mysqld</command>, but in order to do this
- you need to run the <command>mysqld_multi</command>
- script as the Unix <literal>root</literal> user. Having
- the option in the option file doesn't matter; you just
- get a warning if you are not the superuser and the
+ for <command>mysqld</command>, but to do this you need
+ to run the <command>mysqld_multi</command> script as the
+ Unix <literal>root</literal> user. Having the option in
+ the option file doesn't matter; you just get a warning
+ if you are not the superuser and the
<command>mysqld</command> processes are started under
your own Unix account.
</para>
@@ -10794,8 +10794,8 @@
folder. This script invokes the <command>mysqld_safe</command>
script by default. However, you can set the
<literal>use_mysqld_safe</literal> variable in the script to
- <literal>0</literal> (zero) in order to use the MySQL Instance
- Manager to start a server.
+ <literal>0</literal> (zero) to use the MySQL Instance Manager
+ to start a server.
</para>
<remark role="todo">
@@ -18073,10 +18073,10 @@
<para>
Note that yaSSL support on Unix platforms requires that either
<filename>/dev/urandom</filename> or
- <filename>/dev/random</filename> be installed in order to
- retrieve true random numbers. For additional information
- (especially regarding yaSSL on Solaris versions prior to 2.8
- and HP-UX), see Bug #13164.
+ <filename>/dev/random</filename> be installed to retrieve true
+ random numbers. For additional information (especially
+ regarding yaSSL on Solaris versions prior to 2.8 and HP-UX),
+ see Bug #13164.
</para>
<para>
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/innodb.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -171,15 +171,15 @@
recovery capabilities. <emphasis role="bold">However, it cannot do
so</emphasis> if the underlying operating system or hardware does
not work as advertised. Many operating systems or disk subsystems
- may delay or reorder write operations in order to improve
- performance. On some operating systems, the very system call that
- should wait until all unwritten data for a file has been flushed
- — <literal>fsync()</literal> — might actually return
- before the data has been flushed to stable storage. Because of
- this, an operating system crash or a power outage may destroy
- recently committed data, or in the worst case, even corrupt the
- database because of write operations having been reordered. If
- data integrity is important to you, you should perform some
+ may delay or reorder write operations to improve performance. On
+ some operating systems, the very system call that should wait
+ until all unwritten data for a file has been flushed —
+ <literal>fsync()</literal> — might actually return before
+ the data has been flushed to stable storage. Because of this, an
+ operating system crash or a power outage may destroy recently
+ committed data, or in the worst case, even corrupt the database
+ because of write operations having been reordered. If data
+ integrity is important to you, you should perform some
<quote>pull-the-plug</quote> tests before using anything in
production. On Mac OS X 10.3 and up, <literal>InnoDB</literal>
uses a special <literal>fcntl()</literal> file flush method. Under
@@ -5213,11 +5213,11 @@
<para>
<literal>InnoDB</literal> sends diagnostic output to
<literal>stderr</literal> or to files rather than to
- <literal>stdout</literal> or fixed-size memory buffers, in order
- to avoid potential buffer overflows. As a side effect, the
- output of <literal>SHOW ENGINE INNODB STATUS</literal> is
- written to a status file in the MySQL data directory every
- fifteen seconds. The name of the file is
+ <literal>stdout</literal> or fixed-size memory buffers, to avoid
+ potential buffer overflows. As a side effect, the output of
+ <literal>SHOW ENGINE INNODB STATUS</literal> is written to a
+ status file in the MySQL data directory every fifteen seconds.
+ The name of the file is
<filename>innodb_status.<replaceable>pid</replaceable></filename>,
where <replaceable>pid</replaceable> is the server process ID.
<literal>InnoDB</literal> removes the file for a normal
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/installing.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -14228,10 +14228,10 @@
<para>
For older versions of FreeBSD, you must recompile your kernel
- in order to change the maximum data segment size for a
- process. In this case, you should look at the
- <literal>MAXDSIZ</literal> option in the
- <literal>LINT</literal> config file for more information.
+ to change the maximum data segment size for a process. In this
+ case, you should look at the <literal>MAXDSIZ</literal> option
+ in the <literal>LINT</literal> config file for more
+ information.
</para>
<para>
Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/optimization.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -751,7 +751,7 @@
<para>
With the help of <literal>EXPLAIN</literal>, you can see where
- you should add indexes to tables in order to get a faster
+ you should add indexes to tables to get a faster
<literal>SELECT</literal> that uses indexes to find rows. You
can also use <literal>EXPLAIN</literal> to check whether the
optimizer joins the tables in an optimal order. To force the
@@ -2961,7 +2961,7 @@
(<replaceable>x</replaceable> OR <replaceable>y</replaceable>) AND <replaceable>z</replaceable> = (<replaceable>x</replaceable> AND <replaceable>z</replaceable>) OR (<replaceable>y</replaceable> AND <replaceable>z</replaceable>)
</programlisting>
</listitem>
-
+
<listitem>
<para>
Index Merge is not applicable to fulltext indexes. We plan
@@ -5659,8 +5659,8 @@
(observing what is referred to in database theory as
<firstterm>third normal form</firstterm>). However, there
may be situations in which it can be advantageous to
- duplicate information or create summary tables in order to
- gain more speed.
+ duplicate information or create summary tables to gain more
+ speed.
</para>
</listitem>
@@ -6661,7 +6661,7 @@
× <replaceable>N</replaceable> bytes for these columns
by stripping trailing spaces if necessary. The minimum
storage length is kept as <replaceable>N</replaceable> bytes
- in order to facilitate in-place updates in typical cases.
+ to facilitate in-place updates in typical cases.
</para>
</listitem>
@@ -8244,7 +8244,7 @@
is 64; this can be changed with the
<option>--table_open_cache</option> option to
<command>mysqld</command>. Note that MySQL may temporarily open
- more tables than this in order to execute queries.
+ more tables than this to execute queries.
</para>
<para>
@@ -9030,8 +9030,8 @@
<para>
The <literal>optimizer_search_depth</literal> variable tells
how far into the <quote>future</quote> of each incomplete
- plan the optimizer should look in order to evaluate whether
- it should be expanded further. Smaller values of
+ plan the optimizer should look to evaluate whether it should
+ be expanded further. Smaller values of
<literal>optimizer_search_depth</literal> may result in
orders of magnitude smaller query compilation times. For
example, queries with 12, 13, or more tables may easily
Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/problems.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -763,8 +763,8 @@
<literal>mysqli</literal> extension (stands for "MySQL,
Improved"; added in PHP 5) is compatible with the improved
password hashing employed in MySQL 4.1 and higher, and no
- special configuration of MySQL need be done in order to use this
- MySQL client library. For more information about the
+ special configuration of MySQL need be done to use this MySQL
+ client library. For more information about the
<literal>mysqli</literal> extension, see
<ulink url="http://php.net/mysqli"/>.
</para>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/replication.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -260,8 +260,7 @@
<para>
If you're building MySQL from source, it must be compiled with the
<option>--with-row-based-replication</option> switch to
- <command>configure</command> in order to enable row-based
- replication.
+ <command>configure</command> to enable row-based replication.
</para>
<para>
@@ -426,8 +425,8 @@
Dump</literal> thread sends and copies this data to local files,
known as <emphasis>relay logs</emphasis>, in the slave's data
directory. The third thread is the SQL thread, which the slave
- creates in order to read the relay logs and to execute the updates
- they contain.
+ creates to read the relay logs and to execute the updates they
+ contain.
</para>
<para>
Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/restrictions.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -787,10 +787,10 @@
updatable in practice. This includes views that have
<literal>UNION</literal> in their definition. Currently, not all
views that are theoretically updatable can be updated. The initial
- view implementation was deliberately written this way in order to
- get usable, updatable views into MySQL as quickly as possible.
- Many theoretically updatable views can be updated now, but
- limitations still exist:
+ view implementation was deliberately written this way to get
+ usable, updatable views into MySQL as quickly as possible. Many
+ theoretically updatable views can be updated now, but limitations
+ still exist:
</para>
<itemizedlist>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -225,8 +225,8 @@
and then the original table is deleted and the new one is
renamed. While <literal>ALTER TABLE</literal> is executing, the
original table is readable by other clients. Updates and writes
- to the table are stalled until the new table is ready, then are
- automatically redirected to the new table without any failed
+ to the table are stalled until the new table is ready, and then
+ are automatically redirected to the new table without any failed
updates.
</para>
@@ -490,12 +490,11 @@
<literal>DROP PRIMARY KEY</literal> drops the primary index.
<emphasis>Note</emphasis>: In older versions of MySQL, if no
- primary index existed, then <literal>DROP PRIMARY
- KEY</literal> would drop the first <literal>UNIQUE</literal>
- index in the table. This is not the case in MySQL
- ¤t-series;, where trying to use <literal>DROP PRIMARY
- KEY</literal> on a table with no primary key will give rise
- to an error.
+ primary index existed, <literal>DROP PRIMARY KEY</literal>
+ would drop the first <literal>UNIQUE</literal> index in the
+ table. This is not the case in MySQL ¤t-series;, where
+ trying to use <literal>DROP PRIMARY KEY</literal> on a table
+ with no primary key will give rise to an error.
</para>
<indexterm type="function">
@@ -741,8 +740,8 @@
<para>
To import the backup <filename>.ibd</filename> file back
- into the table, copy it into the database directory, then
- issue this statement:
+ into the table, copy it into the database directory, and
+ then issue this statement:
</para>
<programlisting>
@@ -761,8 +760,8 @@
</indexterm>
With the <literal>mysql_info()</literal> C API function, you
- can find out how many records were copied, and (when
- <literal>IGNORE</literal> is used) how many records were
+ can find out how many rows were copied, and (when
+ <literal>IGNORE</literal> is used) how many rows were
deleted due to duplication of unique key values. See
<xref linkend="mysql-info"/>.
</para>
@@ -801,8 +800,8 @@
the same options as the clause of the same name does for the
<literal>CREATE TABLE</literal> statement clause of the same
name. (See <xref linkend="create-table"/>, for the syntax
- and description.) For example, suppose that you have the
- partitioned table created as shown here:
+ and description.) Suppose that you have the partitioned
+ table created as shown here:
</para>
<programlisting>
@@ -867,17 +866,16 @@
partition or a partitioned table. Instead, if you wish to
rename a partition, you must drop and re-create the
partition; if you wish to rename a partitioned table, you
- must instead drop all partitions, rename the table, then add
- back the partitions that were dropped.
+ must instead drop all partitions, rename the table, and then
+ add back the partitions that were dropped.
</para>
<para>
<literal>COALESCE PARTITION</literal> can be used with a
table that is partitioned by <literal>HASH</literal> or
<literal>KEY</literal> to reduce the number of partitions by
- <replaceable>number</replaceable>. For example, suppose that
- you have created table <literal>t2</literal> using the
- following:
+ <replaceable>number</replaceable>. Suppose that you have
+ created table <literal>t2</literal> using the following:
</para>
<programlisting>
@@ -1633,7 +1631,7 @@
non-<literal>TEMPORARY</literal> table of the same name. (The
existing table is hidden until the temporary table is dropped.)
You must have the <literal>CREATE TEMPORARY TABLES</literal>
- privilege to be able to create temporary tables.
+ privilege to create temporary tables.
</para>
<para>
@@ -1643,7 +1641,7 @@
to that indicated by the <literal>CREATE TABLE</literal>
statement. <emphasis>Note</emphasis>: If you use <literal>IF NOT
EXISTS</literal> in a <literal>CREATE TABLE ... SELECT</literal>
- statement, any records selected by the <literal>SELECT</literal>
+ statement, any rows selected by the <literal>SELECT</literal>
part are inserted whether or not the table already exists.
</para>
@@ -2250,8 +2248,8 @@
<para>
For <literal>MyISAM</literal> tables, each
<literal>NULL</literal> column takes one bit extra, rounded
- up to the nearest byte. The maximum record length in bytes
- can be calculated as follows:
+ up to the nearest byte. The maximum row length in bytes can
+ be calculated as follows:
</para>
<programlisting>
@@ -2263,11 +2261,10 @@
<para>
<replaceable>delete_flag</replaceable> is 1 for tables with
- static record format. Static tables use a bit in the row
- record for a flag that indicates whether the row has been
- deleted. <replaceable>delete_flag</replaceable> is 0 for
- dynamic tables because the flag is stored in the dynamic row
- header.
+ static row format. Static tables use a bit in the row record
+ for a flag that indicates whether the row has been deleted.
+ <replaceable>delete_flag</replaceable> is 0 for dynamic
+ tables because the flag is stored in the dynamic row header.
</para>
<para>
@@ -2433,7 +2430,7 @@
<para>
An approximation of the average row length for your table.
You need to set this only for large tables with
- variable-size records.
+ variable-size rows.
</para>
<para>
@@ -2643,10 +2640,10 @@
</para>
<para>
- <literal>InnoDB</literal> records are stored in compact
- format (<literal>ROW_FORMAT=COMPACT</literal>) by default.
- The non-compact format used in older versions of MySQL can
- still be requested by specifying
+ <literal>InnoDB</literal> rows are stored in compact format
+ (<literal>ROW_FORMAT=COMPACT</literal>) by default. The
+ non-compact format used in older versions of MySQL can still
+ be requested by specifying
<literal>ROW_FORMAT=REDUNDANT</literal>.
</para>
</listitem>
@@ -2800,8 +2797,8 @@
<para>
The <literal>LINEAR</literal> keyword entails a somewhat
different algorithm. In this case, the number of the
- partition in which a record is stored is calculated as
- the result of one or more logical <literal>AND</literal>
+ partition in which a row is stored is calculated as the
+ result of one or more logical <literal>AND</literal>
operations. For discussion and examples of linear
hashing, see <xref linkend="partitioning-linear-hash"/>.
</para>
@@ -2872,9 +2869,9 @@
</para>
<para>
- For example, suppose that you have a table that you wish
- to partition on a column containing year values,
- according to the following scheme:
+ Suppose that you have a table that you wish to partition
+ on a column containing year values, according to the
+ following scheme:
</para>
<informaltable>
@@ -2963,7 +2960,7 @@
This is useful when assigning partitions based on a
table column with a restricted set of possible values,
such as a state or country code. In such a case, all
- records pertaining to a certain state or country can be
+ rows pertaining to a certain state or country can be
assigned to a single partition, or a partition can be
reserved for a certain set of states or countries. It is
similar to <literal>RANGE</literal>, except that only
@@ -3011,7 +3008,7 @@
<replaceable>num</replaceable></literal> clause, where
<replaceable>num</replaceable> is the number of
partitions. If both this clause <emphasis>and</emphasis>
- any <literal>PARTITION</literal> clauses are used, then
+ any <literal>PARTITION</literal> clauses are used,
<replaceable>num</replaceable> must be equal to the
total number of any partitions that are declared using
<literal>PARTITION</literal> clauses.
@@ -3126,8 +3123,8 @@
<para>
One data directory and one index directory may be
- specified per partition. If left unspecified, then the
- data and indexes are stored in the default MySQL data
+ specified per partition. If left unspecified, the data
+ and indexes are stored in the default MySQL data
directory.
</para>
</listitem>
@@ -3378,13 +3375,13 @@
<para>
You can precede the <literal>SELECT</literal> by
<literal>IGNORE</literal> or <literal>REPLACE</literal> to
- indicate how to handle records that duplicate unique key values.
- With <literal>IGNORE</literal>, new records that duplicate an
- existing record on a unique key value are discarded. With
- <literal>REPLACE</literal>, new records replace records that
- have the same unique key value. If neither
- <literal>IGNORE</literal> nor <literal>REPLACE</literal> is
- specified, duplicate unique key values result in an error.
+ indicate how to handle rows that duplicate unique key values.
+ With <literal>IGNORE</literal>, new rows that duplicate an
+ existing row on a unique key value are discarded. With
+ <literal>REPLACE</literal>, new rows replace rows that have the
+ same unique key value. If neither <literal>IGNORE</literal> nor
+ <literal>REPLACE</literal> is specified, duplicate unique key
+ values result in an error.
</para>
<para>
@@ -3878,7 +3875,7 @@
<literal>DELETE</literal> deletes rows from
<replaceable>tbl_name</replaceable> that satisfy the condition
given by <replaceable>where_definition</replaceable>, and
- returns the number of records deleted.
+ returns the number of rows deleted.
</para>
<para>
@@ -3957,14 +3954,13 @@
</para>
<para>
- In <literal>MyISAM</literal> tables, deleted records are
- maintained in a linked list and subsequent
- <literal>INSERT</literal> operations reuse old record positions.
- To reclaim unused space and reduce file sizes, use the
- <literal>OPTIMIZE TABLE</literal> statement or the
- <command>myisamchk</command> utility to reorganize tables.
- <literal>OPTIMIZE TABLE</literal> is easier, but
- <command>myisamchk</command> is faster. See
+ In <literal>MyISAM</literal> tables, deleted rows are maintained
+ in a linked list and subsequent <literal>INSERT</literal>
+ operations reuse old row positions. To reclaim unused space and
+ reduce file sizes, use the <literal>OPTIMIZE TABLE</literal>
+ statement or the <command>myisamchk</command> utility to
+ reorganize tables. <literal>OPTIMIZE TABLE</literal> is easier,
+ but <command>myisamchk</command> is faster. See
<xref linkend="optimize-table"/>, and
<xref linkend="optimization"/>.
</para>
@@ -3998,14 +3994,14 @@
<listitem>
<para>
- Insert many records into the table. Each insert results in
- an index value that is added to the high end of the index.
+ Insert many rows into the table. Each insert results in an
+ index value that is added to the high end of the index.
</para>
</listitem>
<listitem>
<para>
- Delete a block of records at the low end of the column range
+ Delete a block of rows at the low end of the column range
using <literal>DELETE QUICK</literal>.
</para>
</listitem>
@@ -4016,9 +4012,9 @@
In this scenario, the index blocks associated with the deleted
index values become underfilled but are not merged with other
index blocks due to the use of <literal>QUICK</literal>. They
- remain underfilled when new inserts occur, because new records
- does not have index values in the deleted range. Furthermore,
- they remain underfilled even if you later use
+ remain underfilled when new inserts occur, because new rows does
+ not have index values in the deleted range. Furthermore, they
+ remain underfilled even if you later use
<literal>DELETE</literal> without <literal>QUICK</literal>,
unless some of the deleted index values happen to lie in index
blocks within or adjacent to the underfilled blocks. To reclaim
@@ -4725,8 +4721,8 @@
</programlisting>
<para>
- The rows-affected value is 1 if the row is inserted as a new
- record and 2 if an existing record is updated.
+ The rows-affected value is 1 if the row is inserted as a new row
+ and 2 if an existing row is updated.
</para>
<para>
@@ -4956,7 +4952,7 @@
<listitem>
<para>
Specify <literal>IGNORE</literal> explicitly to ignore
- records that would cause duplicate-key violations.
+ rows that would cause duplicate-key violations.
</para>
</listitem>
@@ -5203,7 +5199,7 @@
<listitem>
<para>
The client cannot obtain from the server the number of
- duplicate records or the <literal>AUTO_INCREMENT</literal>
+ duplicate rows or the <literal>AUTO_INCREMENT</literal>
value for the resulting row, because the
<literal>INSERT</literal> returns before the insert
operation has been completed. (If you use the C API, the
@@ -5430,11 +5426,10 @@
If you specify <literal>CONCURRENT</literal> with a
<literal>MyISAM</literal> table that satisfies the condition for
concurrent inserts (that is, it contains no free blocks in the
- middle), then other threads can retrieve data from the table
- while <literal>LOAD DATA</literal> is executing. Using this
- option affects the performance of <literal>LOAD DATA</literal> a
- bit, even if no other thread is using the table at the same
- time.
+ middle), other threads can retrieve data from the table while
+ <literal>LOAD DATA</literal> is executing. Using this option
+ affects the performance of <literal>LOAD DATA</literal> a bit,
+ even if no other thread is using the table at the same time.
</para>
<para>
@@ -5547,8 +5542,8 @@
<literal>LOCAL</literal> works only if your server and your
client both have been enabled to allow it. For example, if
<command>mysqld</command> was started with
- <option>--local-infile=0</option>, then <literal>LOCAL</literal>
- does not work. See <xref linkend="load-data-local"/>.
+ <option>--local-infile=0</option>, <literal>LOCAL</literal> does
+ not work. See <xref linkend="load-data-local"/>.
</para>
<para>
@@ -5566,8 +5561,8 @@
<para>
The <literal>REPLACE</literal> and <literal>IGNORE</literal>
- keywords control handling of input records that duplicate
- existing records on unique key values.
+ keywords control handling of input rows that duplicate existing
+ rows on unique key values.
</para>
<para>
@@ -6462,10 +6457,10 @@
<para>
<literal>REPLACE</literal> works exactly like
- <literal>INSERT</literal>, except that if an old record in the
- table has the same value as a new record for a <literal>PRIMARY
- KEY</literal> or a <literal>UNIQUE</literal> index, the old
- record is deleted before the new record is inserted. See
+ <literal>INSERT</literal>, except that if an old row in the
+ table has the same value as a new row for a <literal>PRIMARY
+ KEY</literal> or a <literal>UNIQUE</literal> index, the old row
+ is deleted before the new row is inserted. See
<xref linkend="insert"/>.
</para>
@@ -6474,8 +6469,8 @@
standard. It either inserts, or <emphasis>deletes</emphasis> and
inserts. If you're looking for a statement that follows the SQL
standard, and that either inserts or
- <emphasis>updates</emphasis>, look for the <literal>INSERT
- … ON DUPLICATE KEY UPDATE</literal> statement; see
+ <emphasis>updates</emphasis>, look for the <literal>INSERT ...
+ ON DUPLICATE KEY UPDATE</literal> statement; see
<xref linkend="insert"/>.
</para>
@@ -6505,8 +6500,8 @@
</para>
<para>
- To be able to use <literal>REPLACE</literal>, you must have both
- the <literal>INSERT</literal> and <literal>DELETE</literal>
+ To use <literal>REPLACE</literal>, you must have both the
+ <literal>INSERT</literal> and <literal>DELETE</literal>
privileges for the table.
</para>
@@ -7244,9 +7239,9 @@
<emphasis>must</emphasis> escape any <literal>FIELDS
TERMINATED BY</literal>, <literal>ENCLOSED BY</literal>,
<literal>ESCAPED BY</literal>, or <literal>LINES TERMINATED
- BY</literal> characters to be able to read the file back
- reliably. ASCII <literal>NUL</literal> is escaped to make it
- easier to view with some pagers.
+ BY</literal> characters to read the file back reliably.
+ ASCII <literal>NUL</literal> is escaped to make it easier to
+ view with some pagers.
</para>
<para>
@@ -7574,7 +7569,7 @@
<programlisting>
<replaceable>table_references:</replaceable>
- <replaceable>table_reference</replaceable> [, <replaceable>table_reference</replaceable>] …
+ <replaceable>table_reference</replaceable> [, <replaceable>table_reference</replaceable>] ...
<replaceable>table_reference</replaceable>:
<replaceable>table_factor</replaceable>
@@ -7702,12 +7697,12 @@
<listitem>
<para>
- If there is no matching record for the right table in the
+ If there is no matching row for the right table in the
<literal>ON</literal> or <literal>USING</literal> part in
a <literal>LEFT JOIN</literal>, a row with all columns set
to <literal>NULL</literal> is used for the right table.
- You can use this fact to find records in a table that have
- no counterpart in another table:
+ You can use this fact to find rows in a table that have no
+ counterpart in another table:
</para>
<remark role="help-example"/>
@@ -8016,7 +8011,7 @@
</para>
<programlisting>
-SELECT … FROM t1 NATURAL JOIN t2 NATURAL JOIN t3;
+SELECT ... FROM t1 NATURAL JOIN t2 NATURAL JOIN t3;
</programlisting>
<para>
@@ -8033,7 +8028,7 @@
</para>
<programlisting>
-SELECT … FROM t1, t2, t3
+SELECT ... FROM t1, t2, t3
WHERE t1.b = t2.b AND t2.c = t3.c;
</programlisting>
@@ -8045,7 +8040,7 @@
</para>
<programlisting>
-SELECT … FROM t1, t2, t3
+SELECT ... FROM t1, t2, t3
WHERE t1.b = t2.b AND t2.c = t3.c AND t1.a = t3.a;
</programlisting>
@@ -8589,7 +8584,7 @@
</para>
<para>
- For example, suppose that we make two tables:
+ Suppose that we make two tables:
</para>
<programlisting>
@@ -8927,7 +8922,7 @@
<title>&title-exists-and-not-exists-subqueries;</title>
<para>
- If a subquery returns any rows at all, then <literal>EXISTS
+ If a subquery returns any rows at all, <literal>EXISTS
<replaceable>subquery</replaceable></literal> is
<literal>TRUE</literal>, and <literal>NOT EXISTS
<replaceable>subquery</replaceable></literal> is
@@ -8950,7 +8945,7 @@
<para>
For the preceding example, if <literal>t2</literal> contains
any rows, even rows with nothing but <literal>NULL</literal>
- values, then the <literal>EXISTS</literal> condition is
+ values, the <literal>EXISTS</literal> condition is
<literal>TRUE</literal>. This is actually an unlikely example
because a <literal>[NOT] EXISTS</literal> subquery almost
always contains correlations. Here are some more realistic
@@ -9266,8 +9261,8 @@
<para>
If <literal>SELECT column1 FROM t2</literal> returns just
one row the previous query will work. If the subquery
- returns more than one row, then error 1242 will occur. In
- that case, the query should be rewritten as:
+ returns more than one row, error 1242 will occur. In that
+ case, the query should be rewritten as:
</para>
<programlisting>
@@ -9663,7 +9658,7 @@
<listitem><para>
The second option is to use a procedural programming language
(such as Perl or PHP) to submit a <literal>SELECT</literal> query
- to obtain the primary keys for the records to be deleted, and then
+ to obtain the primary keys for the rows to be deleted, and then
use these values to construct the <literal>DELETE</literal>
statement (<literal>DELETE FROM ... WHERE key_col IN (key1, key2,
...)</literal>).
@@ -9913,7 +9908,7 @@
<para>
<literal>UPDATE</literal> assignments are evaluated from left to
right. For example, the following statement doubles the
- <literal>age</literal> column, then increments it:
+ <literal>age</literal> column, and then increments it:
</para>
<programlisting>
@@ -10745,8 +10740,8 @@
immediately after the call of <literal>LOCK
TABLES</literal>, and deadlocks can very easily happen. Note
that we do not acquire the <literal>InnoDB</literal> table
- lock at all if <literal>AUTOCOMMIT=1</literal>, in order to
- help old applications avoid unnecessary deadlocks.
+ lock at all if <literal>AUTOCOMMIT=1</literal>, to help old
+ applications avoid unnecessary deadlocks.
</para>
</listitem>
@@ -10809,9 +10804,9 @@
</programlisting>
<para>
- If your queries refer to a table using an alias, then you must
- lock the table using that same alias. It does not work to lock
- the table without specifying the alias:
+ If your queries refer to a table using an alias, you must lock
+ the table using that same alias. It does not work to lock the
+ table without specifying the alias:
</para>
<programlisting>
@@ -11564,8 +11559,7 @@
<para>
For an <literal>IDLE</literal> XA transaction, you can
issue either an <literal>XA PREPARE</literal> statement or
- an <literal>XA COMMIT … ONE PHASE</literal>
- statement:
+ an <literal>XA COMMIT ... ONE PHASE</literal> statement:
</para>
<itemizedlist>
@@ -11584,8 +11578,8 @@
<listitem>
<para>
- <literal>XA COMMIT … ONE PHASE</literal>
- prepares and commits the transaction. The
+ <literal>XA COMMIT ... ONE PHASE</literal> prepares
+ and commits the transaction. The
<replaceable>xid</replaceable> value will not be
listed by <literal>XA RECOVER</literal> because the
transaction terminates.
@@ -11695,8 +11689,8 @@
To use it, you must have the global <literal>CREATE
USER</literal> privilege or the <literal>INSERT</literal>
privilege for the <literal>mysql</literal> database. For each
- account, <literal>CREATE USER</literal> creates a new record
- in the <literal>mysql.user</literal> table that has no
+ account, <literal>CREATE USER</literal> creates a new row in
+ the <literal>mysql.user</literal> table that has no
privileges. An error occurs if the account already exists.
</para>
@@ -11785,7 +11779,7 @@
<literal>'jeffrey'@'localhost'</literal>. The user and host
parts of the account name correspond to the
<literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table record for the
+ values of the <literal>user</literal> table row for the
account.
</para>
@@ -11799,8 +11793,8 @@
</programlisting>
<para>
- The statement removes privilege records for the account from
- all grant tables.
+ The statement removes privilege rows for the account from all
+ grant tables.
</para>
<remark role="help-description-end"/>
@@ -11925,14 +11919,14 @@
</para>
<para>
- If the grant tables hold privilege records that contain
+ If the grant tables hold privilege rows that contain
mixed-case database or table names and the
<literal>lower_case_table_names</literal> system variable is
set, <literal>REVOKE</literal> cannot be used to revoke the
privileges. It will be necessary to manipulate the grant
tables directly. (<literal>GRANT</literal> will not create
- such records when <literal>lower_case_table_names</literal> is
- set, but such records might have been created prior to setting
+ such rows when <literal>lower_case_table_names</literal> is
+ set, but such rows might have been created prior to setting
the variable.)
</para>
@@ -12276,7 +12270,7 @@
<literal>EXECUTE</literal>, and <literal>GRANT
OPTION</literal>. <literal>CREATE ROUTINE</literal> is not a
routine-level privilege because you must have this privilege
- to be able to create a routine in the first place.
+ to create a routine in the first place.
</para>
<para>
@@ -12661,7 +12655,7 @@
The <literal>REQUIRE SSL</literal> option tells the server
to allow only SSL-encrypted connections for the account.
Note that this option can be omitted if there are any
- access-control records that allow non-SSL connections.
+ access-control rows that allow non-SSL connections.
</para>
<programlisting>
@@ -13590,11 +13584,11 @@
deleted a large part of a table or if you have made many
changes to a table with variable-length rows (tables that have
<literal>VARCHAR</literal>, <literal>BLOB</literal>, or
- <literal>TEXT</literal> columns). Deleted records are
- maintained in a linked list and subsequent
- <literal>INSERT</literal> operations reuse old record
- positions. You can use <literal>OPTIMIZE TABLE</literal> to
- reclaim the unused space and to defragment the data file.
+ <literal>TEXT</literal> columns). Deleted rows are maintained
+ in a linked list and subsequent <literal>INSERT</literal>
+ operations reuse old row positions. You can use
+ <literal>OPTIMIZE TABLE</literal> to reclaim the unused space
+ and to defragment the data file.
</para>
<remark role="help-description-end"/>
@@ -13859,7 +13853,7 @@
The backup for each table consists of its
<filename>.frm</filename> format file and
<filename>.MYD</filename> data file. The restore operation
- restores those files, then uses them to rebuild the
+ restores those files, and then uses them to rebuild the
<filename>.MYI</filename> index file. Restoring takes longer
than backing up due to the need to rebuild the indexes. The
more indexes the table has, the longer it takes.
@@ -14671,7 +14665,7 @@
</para>
<para>
- The maximum number of records to return from
+ The maximum number of rows to return from
<literal>SELECT</literal> statements. The default value for
a new connection is <quote>unlimited.</quote> If you have
changed the limit, the default value can be restored by
@@ -15541,7 +15535,7 @@
A <literal>Support</literal> value indicates whether the
particular storage engine is supported, and which is the
default engine. For example, if the server is started with the
- <option>--default-table-type=InnoDB</option> option, then the
+ <option>--default-table-type=InnoDB</option> option, the
<literal>Support</literal> value for the
<literal>InnoDB</literal> row has the value
<literal>DEFAULT</literal>. See
@@ -16553,9 +16547,8 @@
<para>
Means that the thread is flushing the changed table data
to disk and closing the used tables. This should be a fast
- operation. If not, then you should verify that you do not
- have a full disk and that the disk is not in very heavy
- use.
+ operation. If not, you should verify that you do not have
+ a full disk and that the disk is not in very heavy use.
</para>
</listitem>
@@ -16898,9 +16891,9 @@
<para>
The thread got a notification that the underlying
structure for a table has changed and it needs to reopen
- the table to get the new structure. However, to be able to
- reopen the table, it must wait until all other threads
- have closed the table in question.
+ the table to get the new structure. However, to reopen the
+ table, it must wait until all other threads have closed
+ the table in question.
</para>
<para>
@@ -17522,8 +17515,8 @@
</itemizedlist>
<para>
- You must have the <literal>SUPER</literal> privilege in order
- to execute <literal>SHOW TRIGGERS</literal>.
+ You must have the <literal>SUPER</literal> privilege to
+ execute <literal>SHOW TRIGGERS</literal>.
</para>
<para>
@@ -18489,8 +18482,8 @@
<remark role="help-description-end"/>
<para>
- You must have the <literal>RELOAD</literal> privilege in order
- to execute <literal>RESET</literal>.
+ You must have the <literal>RELOAD</literal> privilege to
+ execute <literal>RESET</literal>.
</para>
<para>
@@ -19972,7 +19965,7 @@
replicate <literal>TIMESTAMP</literal> successfully.
However, the drawback for
<literal>Seconds_Behind_Master</literal> is that if M1
- also receives direct updates from clients, then the value
+ also receives direct updates from clients, the value
randomly deviates, because sometimes the last M1's event
is from M0 and sometimes it is from a direct update, and
so is the most recent timestamp.
Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/storage-engines.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -2315,8 +2315,8 @@
the MySQL server starts, you can use the
<option>--init-file</option> option. For example, you can put
statements such as <literal>INSERT INTO ... SELECT</literal>
- or <literal>LOAD DATA INFILE</literal> into this file in order
- to load the table from a persistent data source. See
+ or <literal>LOAD DATA INFILE</literal> into this file to load
+ the table from a persistent data source. See
<xref linkend="server-options"/>, and
<xref linkend="load-data"/>.
</para>
Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml 2006-01-25 01:13:31 UTC (rev 1026)
+++ trunk/refman-5.1/tutorial.xml 2006-01-25 01:13:59 UTC (rev 1027)
@@ -145,26 +145,26 @@
The <literal>mysql></literal> prompt tells you that
<command>mysql</command> is ready for you to enter commands.
</para>
-
+
<para>
If you are logging in on the same machine that MySQL is running
on, you can omit the host, and simply use the following:
</para>
-
+
<programlisting>
shell< <userinput>mysql -u <replaceable>user</replaceable> -p</userinput>
</programlisting>
-
+
<para>
If, when you attempt to log in, you get an error message such as
<errortext>ERROR 2002 (HY000): Can't connect to local MySQL server
- through socket '/tmp/mysql.sock' (2)</errortext>, it means that
+ through socket '/tmp/mysql.sock' (2)</errortext>, it means that
that MySQL server daemon (Unix) or service (Windows) is not
- running. Consult the administrator or see the section of
+ running. Consult the administrator or see the section of
<xref linkend="installing"/> that is appropriate to your operating
system.
</para>
-
+
<para>
For help with other problems often encountered when trying to log
in, see <xref linkend="common-errors"/>.
@@ -757,15 +757,15 @@
recommended best practice is always to use the same lettercase
that was used when the database was created.)
</para>
-
+
<para>
<emphasis role="bold">Note</emphasis>: If you get an error such
as <errortext>ERROR 1044 (42000): Access denied for user
- 'monty'@'localhost' to database 'menagerie'</errortext> when
+ 'monty'@'localhost' to database 'menagerie'</errortext> when
attempting to create a database, this means that your user
account does not have the necessary privileges to do so. Discuss
- this with the administrator or see
- <xref linkend="privilege-system"/>.
+ this with the administrator or see
+ <xref linkend="privilege-system"/>.
</para>
<para>
@@ -2031,10 +2031,10 @@
assume that it is not possible to insert a zero or an empty
string into a column defined as <literal>NOT NULL</literal>,
but this is not the case. These are in fact values, whereas
- <literal>NULL</literal> means <quote>not having a value.</quote> You can
- test this easily enough by using <literal>IS
- </literal>[<literal>NOT</literal>]<literal> NULL</literal> as
- shown:
+ <literal>NULL</literal> means <quote>not having a
+ value.</quote> You can test this easily enough by using
+ <literal>IS </literal>[<literal>NOT</literal>]<literal>
+ NULL</literal> as shown:
</para>
<programlisting>
@@ -2765,9 +2765,9 @@
</programlisting>
<para>
- In this query, we specify aliases for the table name in order
- to refer to the columns and keep straight which instance of
- the table each column reference is associated with.
+ In this query, we specify aliases for the table name to refer
+ to the columns and keep straight which instance of the table
+ each column reference is associated with.
</para>
</section>
@@ -3460,9 +3460,9 @@
<para>
The use of <literal>REFERENCES</literal> in this way as a
- comment or <quote>reminder</quote> in a column definition works with both
- <literal>MyISAM</literal> and <literal>BerkeleyDB</literal>
- tables.
+ comment or <quote>reminder</quote> in a column definition works
+ with both <literal>MyISAM</literal> and
+ <literal>BerkeleyDB</literal> tables.
</para>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1027 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 25 Jan |
