Author: paul
Date: 2006-01-03 06:33:58 +0100 (Tue, 03 Jan 2006)
New Revision: 647
Log:
r5777@frost: paul | 2006-01-02 23:33:04 -0600
Cleanup revisions.
Modified:
trunk/
trunk/refman-4.1/connector-odbc.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/functions.xml
trunk/refman-4.1/innodb.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/ndbcluster.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/connector-odbc.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.0/information-schema.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/connector-odbc.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/functions.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/innodb.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/ndbcluster.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5776
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1848
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5777
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1848
Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-4.1/connector-odbc.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -4516,7 +4516,7 @@
or <literal>link</literal>, and then click
<literal>OK</literal>. If you're linking a table and it
doesn't have an index that uniquely identifies each record,
- then Microsoft Access displays a list of the fields in the
+ Microsoft Access displays a list of the fields in the
linked table. Click a field or a combination of fields that
uniquely identifies each record, and then click
<literal>OK</literal>.
@@ -5044,7 +5044,7 @@
<para>
If you find any other good example or HOW-TO on ADO/DAO/RDO,
- then please send the details to
+ please send the details to
<email>myodbc@stripped</email>
</para>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-4.1/database-administration.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -2976,7 +2976,7 @@
<para>
To change the number of file descriptors available to
<command>mysqld</command>. If this is not set or set to 0,
- then <command>mysqld</command> uses this value to reserve
+ <command>mysqld</command> uses this value to reserve
file descriptors to use with
<literal>setrlimit()</literal>. If this value is 0 then
<command>mysqld</command> reserves
@@ -21644,7 +21644,7 @@
<para>
Before MySQL 4.1, if you also use
<option>--log-long-format</option> when logging slow queries,
- then queries that are not using indexes are logged as well.
+ queries that are not using indexes are logged as well.
<option>--log-long-format</option> is deprecated as of MySQL
version 4.1, when <option>--log-short-format</option> was
introduced. (Long log format is the default setting since
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-4.1/functions.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -13356,7 +13356,7 @@
generated by <literal>INET_ATON()</literal>, it is
recommended that you use an <literal>INT UNSIGNED</literal>
column. If you use a (signed) <literal>INT</literal> column,
- then values corresponding to IP addresses for which the
+ values corresponding to IP addresses for which the
first octet is greater than 127 will be truncated to
2147483647 (that is, the value returned by
<literal>INET_ATON('127.255.255.255')</literal>). See
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-4.1/innodb.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -6789,7 +6789,7 @@
MySQL-4.1.9 on Windows, and you have set
<literal>innodb_file_per_table</literal> in
<filename>my.cnf</filename> or <filename>my.ini</filename>,
- then this is Bug #8021, and a workaround is to put the line
+ this is Bug #8021, and a workaround is to put the line
<literal>innodb_flush_method=unbuffered</literal> to your
<filename>my.cnf</filename> or <filename>my.ini</filename>
file.)
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-4.1/installing.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -14148,7 +14148,7 @@
in most cases. After reading the following text, if you are in
doubt about what to do, try our binary first to see whether it
meets your needs. If you discover that it is not good enough,
- then you may want to try your own build. In that case, we
+ you may want to try your own build. In that case, we
would appreciate a note about it so that we can build a better
binary next time.
</para>
@@ -17485,9 +17485,9 @@
The following is a guide to setting <literal>PATH</literal> on
OpenServer 6. If the user wants the traditional OpenServer
5.0.x then <literal>PATH</literal> should be
- <filename>/bin</filename> first. If the user wants LFS support
- then the path should be <filename>/u95/bin:/bin</filename>. If
- the user want UnixWare 7 support first then the path would be
+ <filename>/bin</filename> first. If the user wants LFS support,
+ the path should be <filename>/u95/bin:/bin</filename>. If
+ the user wants UnixWare 7 support first, the path would be
<filename>/udk/bin:/u95/bin:/bin:</filename>.
</para>
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-4.1/ndbcluster.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -1293,7 +1293,7 @@
<para>
If you did not modify the <literal>ENGINE=</literal> clauses
in the table definitions prior to importing the SQL script,
- then you should at this point run the following commands:
+ you should run the following commands at this point:
</para>
<programlisting>
@@ -4353,7 +4353,7 @@
makes it possible to replay these updates whenever the
system is restarted. The NDB recovery algorithm uses a
"fuzzy" checkpoint of the data together with the UNDO log,
- then applies the REDO log to play back all changes up to
+ and then applies the REDO log to play back all changes up to
the restoration point.
</para>
@@ -5639,8 +5639,8 @@
</para>
<para>
- When the size of the cluster log reaches one million bytes
- then the file is renamed to
+ When the size of the cluster log reaches one million bytes,
+ the file is renamed to
<filename>ndb_<replaceable>node_id</replaceable>_cluster.log.<replaceable>seq_id</replaceable></filename>
(was
<filename>cluster.log.<replaceable>seq_id</replaceable></filename>
@@ -8571,8 +8571,8 @@
time, which means that the full cost of setting up a number
of TCP/IP messages and a number of costs for context
switching are borne by this single request. In the case
- where multiple primary key accesses are sent in one batch
- then those accesses will share the cost of setting up the
+ where multiple primary key accesses are sent in one batch,
+ those accesses will share the cost of setting up the
necessary TCP/IP messages and context switches. If the
TCP/IP messages are for different destinations, then
additional TCP/IP messages need to be set up.
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-4.1/sql-syntax.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -201,7 +201,7 @@
<para>
<literal>ALTER TABLE</literal> works by making a temporary copy
of the original table. The alteration is performed on the copy,
- then the original table is deleted and the new one is renamed.
+ 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
Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.0/connector-odbc.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -4516,7 +4516,7 @@
or <literal>link</literal>, and then click
<literal>OK</literal>. If you're linking a table and it
doesn't have an index that uniquely identifies each record,
- then Microsoft Access displays a list of the fields in the
+ Microsoft Access displays a list of the fields in the
linked table. Click a field or a combination of fields that
uniquely identifies each record, and then click
<literal>OK</literal>.
@@ -5044,7 +5044,7 @@
<para>
If you find any other good example or HOW-TO on ADO/DAO/RDO,
- then please send the details to
+ please send the details to
<email>myodbc@stripped</email>
</para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.0/database-administration.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -3756,7 +3756,7 @@
<para>
To change the number of file descriptors available to
<command>mysqld</command>. If this is not set or set to 0,
- then <command>mysqld</command> uses this value to reserve
+ <command>mysqld</command> uses this value to reserve
file descriptors to use with
<literal>setrlimit()</literal>. If this value is 0 then
<command>mysqld</command> reserves
@@ -5775,8 +5775,8 @@
server. If one of these variables is set globally, then
its effects persist until the global value is changed or
overridden by setting them locally, or until
- <command>mysqld</command> is restarted; if set locally,
- then the new value affects
+ <command>mysqld</command> is restarted. If set locally,
+ the new value affects
<literal>AUTO_INCREMENT</literal> columns for all tables
into which new rows are inserted by the current user for
the duration of the session, unless the values are changed
@@ -10246,7 +10246,7 @@
Normally, writes to the <literal>InnoDB</literal> buffer
pool happen in the background. However, if it is necessary
to read or create a page and no clean pages are available,
- then it is also necessary to wait for pages to be flushed
+ it is also necessary to wait for pages to be flushed
first. This counter counts instances of these waits. If
the buffer pool size has been set properly, this value
should be small. Added in MySQL 5.0.2.
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.0/functions.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -13370,7 +13370,7 @@
generated by <literal>INET_ATON()</literal>, it is
recommended that you use an <literal>INT UNSIGNED</literal>
column. If you use a (signed) <literal>INT</literal> column,
- then values corresponding to IP addresses for which the
+ values corresponding to IP addresses for which the
first octet is greater than 127 will be truncated to
2147483647 (that is, the value returned by
<literal>INET_ATON('127.255.255.255')</literal>). See
Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.0/information-schema.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -1691,7 +1691,7 @@
<listitem>
<para>
If the user has <literal>GRANT OPTION</literal> privilege,
- then <literal>IS_GRANTABLE</literal> should be
+ <literal>IS_GRANTABLE</literal> should be
<literal>YES</literal>. Otherwise,
<literal>IS_GRANTABLE</literal> should be
<literal>NO</literal>. The output does not list
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.0/innodb.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -6742,7 +6742,7 @@
Windows, and you have set
<literal>innodb_file_per_table</literal> in
<filename>my.cnf</filename> or <filename>my.ini</filename>,
- then add the line
+ and then add the line
<literal>innodb_flush_method=unbuffered</literal> to your
<filename>my.cnf</filename> or <filename>my.ini</filename>
file.)
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.0/installing.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -4340,7 +4340,7 @@
<filename>C:\Program Files\MySQL\MySQL Server
¤t-series;\data</filename>. If you want to use
<filename>E:\mydata</filename> as the data directory instead,
- then you must do two things:
+ you must do two things:
</para>
<orderedlist>
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.0/ndbcluster.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -1302,7 +1302,7 @@
<para>
If you did not modify the <literal>ENGINE=</literal> clauses
in the table definitions prior to importing the SQL script,
- then you should at this point run the following commands:
+ you should run the following commands at this point:
</para>
<programlisting>
@@ -4366,7 +4366,7 @@
makes it possible to replay these updates whenever the
system is restarted. The NDB recovery algorithm uses a
"fuzzy" checkpoint of the data together with the UNDO log,
- then applies the REDO log to play back all changes up to
+ and then applies the REDO log to play back all changes up to
the restoration point.
</para>
@@ -5631,8 +5631,8 @@
</para>
<para>
- When the size of the cluster log reaches one million bytes
- then the file is renamed to
+ When the size of the cluster log reaches one million bytes,
+ the file is renamed to
<filename>ndb_<replaceable>node_id</replaceable>_cluster.log.<replaceable>seq_id</replaceable></filename>,
where <replaceable>seq_id</replaceable> is the sequence
number of the cluster log file. (For example: If 1, 2, and 3
@@ -8544,8 +8544,8 @@
time, which means that the full cost of setting up a number
of TCP/IP messages and a number of costs for context
switching are borne by this single request. In the case
- where multiple primary key accesses are sent in one batch
- then those accesses will share the cost of setting up the
+ where multiple primary key accesses are sent in one batch,
+ those accesses will share the cost of setting up the
necessary TCP/IP messages and context switches. If the
TCP/IP messages are for different destinations, then
additional TCP/IP messages need to be set up.
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -208,7 +208,7 @@
<para>
<literal>ALTER TABLE</literal> works by making a temporary copy
of the original table. The alteration is performed on the copy,
- then the original table is deleted and the new one is renamed.
+ 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
Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.1/connector-odbc.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -4516,7 +4516,7 @@
or <literal>link</literal>, and then click
<literal>OK</literal>. If you're linking a table and it
doesn't have an index that uniquely identifies each record,
- then Microsoft Access displays a list of the fields in the
+ Microsoft Access displays a list of the fields in the
linked table. Click a field or a combination of fields that
uniquely identifies each record, and then click
<literal>OK</literal>.
@@ -5044,7 +5044,7 @@
<para>
If you find any other good example or HOW-TO on ADO/DAO/RDO,
- then please send the details to
+ please send the details to
<email>myodbc@stripped</email>
</para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.1/database-administration.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -3712,7 +3712,7 @@
<para>
To change the number of file descriptors available to
<command>mysqld</command>. If this is not set or set to 0,
- then <command>mysqld</command> uses this value to reserve
+ <command>mysqld</command> uses this value to reserve
file descriptors to use with
<literal>setrlimit()</literal>. If this value is 0 then
<command>mysqld</command> reserves
@@ -5720,8 +5720,8 @@
server. If one of these variables is set globally, then
its effects persist until the global value is changed or
overridden by setting them locally, or until
- <command>mysqld</command> is restarted; if set locally,
- then the new value affects
+ <command>mysqld</command> is restarted. If set locally,
+ the new value affects
<literal>AUTO_INCREMENT</literal> columns for all tables
into which new rows are inserted by the current user for
the duration of the session, unless the values are changed
@@ -10218,7 +10218,7 @@
Normally, writes to the <literal>InnoDB</literal> buffer
pool happen in the background. However, if it is necessary
to read or create a page and no clean pages are available,
- then it is also necessary to wait for pages to be flushed
+ it is also necessary to wait for pages to be flushed
first. This counter counts instances of these waits. If
the buffer pool size has been set properly, this value
should be small.
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.1/functions.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -13259,7 +13259,7 @@
generated by <literal>INET_ATON()</literal>, it is
recommended that you use an <literal>INT UNSIGNED</literal>
column. If you use a (signed) <literal>INT</literal> column,
- then values corresponding to IP addresses for which the
+ values corresponding to IP addresses for which the
first octet is greater than 127 will be truncated to
2147483647 (that is, the value returned by
<literal>INET_ATON('127.255.255.255')</literal>). See
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.1/information-schema.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -1674,7 +1674,7 @@
<listitem>
<para>
If the user has <literal>GRANT OPTION</literal> privilege,
- then <literal>IS_GRANTABLE</literal> should be
+ <literal>IS_GRANTABLE</literal> should be
<literal>YES</literal>. Otherwise,
<literal>IS_GRANTABLE</literal> should be
<literal>NO</literal>. The output does not list
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.1/innodb.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -6700,7 +6700,7 @@
Windows, and you have set
<literal>innodb_file_per_table</literal> in
<filename>my.cnf</filename> or <filename>my.ini</filename>,
- then add the line
+ and then add the line
<literal>innodb_flush_method=unbuffered</literal> to your
<filename>my.cnf</filename> or <filename>my.ini</filename>
file.)
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.1/installing.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -4337,7 +4337,7 @@
<filename>C:\Program Files\MySQL\MySQL Server
¤t-series;\data</filename>. If you want to use
<filename>E:\mydata</filename> as the data directory instead,
- then you must do two things:
+ you must do two things:
</para>
<orderedlist>
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.1/ndbcluster.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -1302,7 +1302,7 @@
<para>
If you did not modify the <literal>ENGINE=</literal> clauses
in the table definitions prior to importing the SQL script,
- then you should at this point run the following commands:
+ you should run the following commands at this point:
</para>
<programlisting>
@@ -4366,7 +4366,7 @@
makes it possible to replay these updates whenever the
system is restarted. The NDB recovery algorithm uses a
"fuzzy" checkpoint of the data together with the UNDO log,
- then applies the REDO log to play back all changes up to
+ and then applies the REDO log to play back all changes up to
the restoration point.
</para>
@@ -5631,8 +5631,8 @@
</para>
<para>
- When the size of the cluster log reaches one million bytes
- then the file is renamed to
+ When the size of the cluster log reaches one million bytes,
+ the file is renamed to
<filename>ndb_<replaceable>node_id</replaceable>_cluster.log.<replaceable>seq_id</replaceable></filename>,
where <replaceable>seq_id</replaceable> is the sequence
number of the cluster log file. (For example: If 1, 2, and 3
@@ -9606,7 +9606,7 @@
Note that when you create a new <literal>NDB Cluster</literal>
table on the master cluster, if you do so using the
<command>mysqld</command> that acts as the replication master,
- then you must execute a <literal>SHOW TABLES</literal>, also on
+ you must execute a <literal>SHOW TABLES</literal>, also on
the master <command>mysqld</command>, in order to initiate
discovery properly. Otherwise, the new table and any data it
contains cannot be seen by the replication master
@@ -10158,8 +10158,8 @@
time, which means that the full cost of setting up a number
of TCP/IP messages and a number of costs for context
switching are borne by this single request. In the case
- where multiple primary key accesses are sent in one batch
- then those accesses will share the cost of setting up the
+ where multiple primary key accesses are sent in one batch,
+ those accesses will share the cost of setting up the
necessary TCP/IP messages and context switches. If the
TCP/IP messages are for different destinations, then
additional TCP/IP messages need to be set up.
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-03 05:33:23 UTC (rev 646)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-03 05:33:58 UTC (rev 647)
@@ -220,7 +220,7 @@
<para>
<literal>ALTER TABLE</literal> works by making a temporary copy
of the original table. The alteration is performed on the copy,
- then the original table is deleted and the new one is renamed.
+ 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
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r647 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 3 Jan |
