Author: paul
Date: 2007-03-08 04:29:53 +0100 (Thu, 08 Mar 2007)
New Revision: 5248
Log:
r17401@frost: paul | 2007-03-07 21:00:23 -0600
More word economies.
Modified:
trunk/refman-4.1/apis-c.xml
trunk/refman-4.1/charset.xml
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/errors-problems.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/mysql-cluster.xml
trunk/refman-4.1/news-4.1.xml
trunk/refman-4.1/problems.xml
trunk/refman-4.1/restrictions.xml
trunk/refman-4.1/se-innodb.xml
trunk/refman-4.1/storage-engines.xml
trunk/refman-5.0/apis-c.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/errors-problems.xml
trunk/refman-5.0/installing-cs.xml
trunk/refman-5.0/mysql-cluster.xml
trunk/refman-5.0/news-5.0.xml
trunk/refman-5.0/optimization.xml
trunk/refman-5.0/releasenotes-cs-5.0.xml
trunk/refman-5.0/releasenotes-es-5.0.xml
trunk/refman-5.0/se-innodb.xml
trunk/refman-5.0/se-merge.xml
trunk/refman-5.1/apis-c.xml
trunk/refman-5.1/charset.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/errors-problems.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/mysql-cluster.xml
trunk/refman-5.1/news-5.1.xml
trunk/refman-5.1/optimization.xml
trunk/refman-5.1/partitioning-guide.xml
trunk/refman-5.1/replication-configuration.xml
trunk/refman-5.1/restrictions.xml
trunk/refman-5.1/se-federated.xml
trunk/refman-5.1/se-innodb.xml
trunk/refman-5.1/se-merge.xml
trunk/refman-5.1/storage-engines.xml
trunk/refman-common/connector-j.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:21154
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:17400
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:21154
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:17401
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/apis-c.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1484 bytes
@@ -377,7 +377,7 @@
the <literal>STMT_ATTR_UPDATE_MAX_LENGTH</literal> option with
<literal>mysql_stmt_attr_set()</literal> and the lengths will
be set when you call
- <literal>mysql_stmt_store_result()</literal>. (See See
+ <literal>mysql_stmt_store_result()</literal>. (See
<xref linkend="mysql-stmt-attr-set"/>, and
<xref linkend="mysql-stmt-store-result"/>.)
</para>
@@ -5236,7 +5236,7 @@
</para>
<para>
- The name of of the shared-memory object for communication to
+ The name of the shared-memory object for communication to
the server on Windows, if the server supports shared-memory
connections. Should have the same value as the
<option>--shared-memory-base-name</option> option used for
@@ -8515,7 +8515,7 @@
<literal>unsigned</literal>, you should also set the
<literal>is_unsigned</literal> member to true. The table shows the
C variable types that you can use, the corresponding type codes,
- and the SQL data types for which the the supplied value can be
+ and the SQL data types for which the supplied value can be
used without conversion.
</para>
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/charset.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 704 bytes
@@ -2519,7 +2519,7 @@
related system variables. (See
<xref linkend="charset-connection"/>.) Alternatively, a client
program can perform the conversion after receiving the result from
- the server. It is more efficient for the client perform the the
+ the server. It is more efficient for the client perform the
conversion, but this option is not available for many clients
until late in the MySQL 4.x product cycle.
</para>
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/client-utility-programs.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 777 bytes
@@ -798,7 +798,7 @@
specify a table by naming its index file (the file with the
<filename>.MYI</filename> suffix). If you do not invoke
<command>myisam_ftdump</command> in the directory where the
- table files are located, the table or index file name name
+ table files are located, the table or index file name
must be preceded by the pathname to the table's database
directory. Index numbers begin with 0.
</para>
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/data-types.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 626 bytes
@@ -1262,7 +1262,7 @@
<para>
The <literal>CHARACTER SET</literal> attribute specifies
the character set, and the <literal>COLLATE</literal>
- attribute specifies a collation for the the character
+ attribute specifies a collation for the character
set. For example:
</para>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/database-administration.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1179 bytes
@@ -11907,7 +11907,7 @@
<command>mysql_install_db</command> initializes the MySQL
data directory and creates the system tables that it
contains, if they do not exist. Because the MySQL server,
- <command>mysqld</command>, needs to access the data data
+ <command>mysqld</command>, needs to access the data
directory when it runs later, you should either run
<command>mysql_install_db</command> from the same account
that will be used for running <command>mysqld</command> or
@@ -22787,7 +22787,7 @@
</programlisting>
<para>
- With this approach, you must must execute a separate command
+ With this approach, you must execute a separate command
to load the time zone file for each named zone that the
server needs to know about.
</para>
Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/errors-problems.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 629 bytes
@@ -1202,7 +1202,7 @@
<para>
Another networking issue that can cause this error occurs
- if if the MySQL port (default 3306) is blocked by your
+ if the MySQL port (default 3306) is blocked by your
firewall, thus preventing any connections at all to the
MySQL server.
</para>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/installing.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 575 bytes
@@ -2647,7 +2647,7 @@
<para>
<emphasis role="bold">Note</emphasis>: If you are upgrading MySQL
from an existing installation older than MySQL 4.1.5, you must
- first perform the the procedure described in
+ first perform the procedure described in
<xref linkend="windows-upgrading"/>.
</para>
Modified: trunk/refman-4.1/mysql-cluster.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/mysql-cluster.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 730 bytes
@@ -17061,7 +17061,7 @@
<para>
Memory freed by <literal>DELETE</literal> operations
but still allocated to a specific table can also be
- made made available for general re-use by performing a
+ made available for general re-use by performing a
rolling restart of the cluster. See
<xref linkend="mysql-cluster-rolling-restart"/>.
</para>
Modified: trunk/refman-4.1/news-4.1.xml
===================================================================
--- trunk/refman-4.1/news-4.1.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/news-4.1.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1020 bytes
@@ -2227,7 +2227,7 @@
<para>
The length of the pattern string prefix for
<literal>LIKE</literal> operations was calculated incorrectly
- for multi-byte character sets. As a result, the the scanned
+ for multi-byte character sets. As a result, the scanned
range was wider than necessary if the prefix contained any
multi-byte characters. (Bug #16674, Bug #18359)
</para>
@@ -2456,7 +2456,7 @@
<listitem>
<para>
<literal>NDB Cluster</literal>: Renaming a table in such a way
- as to move it to to a different database failed to move the
+ as to move it to a different database failed to move the
table's indexes. (Bug #19967)
</para>
</listitem>
Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/problems.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 591 bytes
@@ -1170,7 +1170,7 @@
<para>
Another networking issue that can cause this error occurs if
- if the MySQL port (default 3306) is blocked by your
+ the MySQL port (default 3306) is blocked by your
firewall, thus preventing any connections at all to the
MySQL server.
</para>
Modified: trunk/refman-4.1/restrictions.xml
===================================================================
--- trunk/refman-4.1/restrictions.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/restrictions.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 662 bytes
@@ -370,7 +370,7 @@
<literal>= ANY</literal>, <literal><> ANY</literal>,
<literal>= ALL</literal>, and <literal><> ALL</literal>
with non-correlated subqueries, use an in-memory hash for a
- result result or a temporary table with an index for larger
+ result or a temporary table with an index for larger
results. Example:
</para>
Modified: trunk/refman-4.1/se-innodb.xml
===================================================================
--- trunk/refman-4.1/se-innodb.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/se-innodb.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 694 bytes
@@ -2895,7 +2895,7 @@
at all. MySQL replication is based on the binary log where MySQL
writes SQL statements that modify data. A transaction that fails
(for example, because of a foreign key violation, or because it
- is is rolled back) is not written to the binary log, so it is
+ is rolled back) is not written to the binary log, so it is
not sent to slaves. See <xref linkend="commit"/>.
</para>
Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-4.1/storage-engines.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 588 bytes
@@ -1791,7 +1791,7 @@
<para>
Additionally, the specification for each column in the parent
<literal>MERGE</literal> table and the underlying table are
- compared. For each each column, MySQL checks:
+ compared. For each column, MySQL checks:
</para>
<itemizedlist>
Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/apis-c.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1082 bytes
@@ -378,7 +378,7 @@
the <literal>STMT_ATTR_UPDATE_MAX_LENGTH</literal> option with
<literal>mysql_stmt_attr_set()</literal> and the lengths will
be set when you call
- <literal>mysql_stmt_store_result()</literal>. (See See
+ <literal>mysql_stmt_store_result()</literal>. (See
<xref linkend="mysql-stmt-attr-set"/>, and
<xref linkend="mysql-stmt-store-result"/>.)
</para>
@@ -8639,7 +8639,7 @@
<literal>unsigned</literal>, you should also set the
<literal>is_unsigned</literal> member to true. The table shows the
C variable types that you can use, the corresponding type codes,
- and the SQL data types for which the the supplied value can be
+ and the SQL data types for which the supplied value can be
used without conversion.
</para>
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/charset.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 635 bytes
@@ -2596,7 +2596,7 @@
</para>
<para>
- A special case occurs if if you have old tables from MySQL 4.0 or
+ A special case occurs if you have old tables from MySQL 4.0 or
earlier where a non-binary column contains values that actually
are encoded in a character set different from the server's default
character set. For example, an application might have stored
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/client-utility-programs.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 777 bytes
@@ -784,7 +784,7 @@
specify a table by naming its index file (the file with the
<filename>.MYI</filename> suffix). If you do not invoke
<command>myisam_ftdump</command> in the directory where the
- table files are located, the table or index file name name
+ table files are located, the table or index file name
must be preceded by the pathname to the table's database
directory. Index numbers begin with 0.
</para>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/data-types.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 626 bytes
@@ -1272,7 +1272,7 @@
<para>
The <literal>CHARACTER SET</literal> attribute specifies
the character set, and the <literal>COLLATE</literal>
- attribute specifies a collation for the the character
+ attribute specifies a collation for the character
set. For example:
</para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/database-administration.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1179 bytes
@@ -15368,7 +15368,7 @@
<command>mysql_install_db</command> initializes the MySQL
data directory and creates the system tables that it
contains, if they do not exist. Because the MySQL server,
- <command>mysqld</command>, needs to access the data data
+ <command>mysqld</command>, needs to access the data
directory when it runs later, you should either run
<command>mysql_install_db</command> from the same account
that will be used for running <command>mysqld</command> or
@@ -26626,7 +26626,7 @@
</programlisting>
<para>
- With this approach, you must must execute a separate command
+ With this approach, you must execute a separate command
to load the time zone file for each named zone that the
server needs to know about.
</para>
Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/errors-problems.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 629 bytes
@@ -1226,7 +1226,7 @@
<para>
Another networking issue that can cause this error occurs
- if if the MySQL port (default 3306) is blocked by your
+ if the MySQL port (default 3306) is blocked by your
firewall, thus preventing any connections at all to the
MySQL server.
</para>
Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/installing-cs.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 584 bytes
@@ -2582,7 +2582,7 @@
<para>
<emphasis role="bold">Note</emphasis>: If you are upgrading MySQL
from an existing installation older than MySQL 4.1.5, you must
- first perform the the procedure described in
+ first perform the procedure described in
<xref linkend="windows-upgrading"/>.
</para>
Modified: trunk/refman-5.0/mysql-cluster.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/mysql-cluster.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1104 bytes
@@ -5209,7 +5209,7 @@
example, in the case of a data node containing several
gigabytes of data, a period as long as 10−15 minutes
(that is, 600000 to 1000000 milliseconds) might be
- required to to perform a node restart.
+ required to perform a node restart.
</para>
</listitem>
@@ -17169,7 +17169,7 @@
<para>
Memory freed by <literal>DELETE</literal> operations
but still allocated to a specific table can also be
- made made available for general re-use by performing a
+ made available for general re-use by performing a
rolling restart of the cluster. See
<xref linkend="mysql-cluster-rolling-restart"/>.
</para>
Modified: trunk/refman-5.0/news-5.0.xml
===================================================================
--- trunk/refman-5.0/news-5.0.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/news-5.0.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 6, Lines Added: 6, Lines Deleted: 6; 2479 bytes
@@ -264,7 +264,7 @@
<listitem>
<para>
<literal>LOAD DATA INFILE</literal> no longer causes an
- implicit commit for all storage storage engines. It now causes
+ implicit commit for all storage engines. It now causes
an implicit commit only for tables using the
<literal>NDB</literal> storage engine. (Bug #11151)
</para>
@@ -1342,7 +1342,7 @@
<listitem>
<para>
- Some user-level level errors were being written to the
+ Some user-level errors were being written to the
server's error log, which is for server errors. (Bug #20402)
</para>
</listitem>
@@ -1405,7 +1405,7 @@
A stored procedure with a <literal>CONTINUE</literal> handler
that encountered an error continued to execute a statement
that caused an error, rather with the next statement following
- the the one that caused the error. (Bug #8153)
+ the one that caused the error. (Bug #8153)
</para>
</listitem>
@@ -2516,7 +2516,7 @@
<para>
The length of the pattern string prefix for
<literal>LIKE</literal> operations was calculated incorrectly
- for multi-byte character sets. As a result, the the scanned
+ for multi-byte character sets. As a result, the scanned
range was wider than necessary if the prefix contained any
multi-byte characters, and rows could be missing from the
result set. (Bug #16674, Bug #18359)
@@ -3490,7 +3490,7 @@
<listitem>
<para>
<literal>NDB Cluster</literal>: Renaming a table in such a way
- as to move it to to a different database failed to move the
+ as to move it to a different database failed to move the
table's indexes. (Bug #19967)
</para>
</listitem>
@@ -17840,7 +17840,7 @@
<para>
Modify <literal>DROP USER</literal> so that it drops the
account, including all its privileges. Formerly, it removed
- the account record only for an account that had had all
+ the account record only for an account that had all
privileges revoked.
</para>
</listitem>
Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/optimization.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 623 bytes
@@ -1636,7 +1636,7 @@
<para>
However, a condition pushdown may also be employed when
- an indexed column column is compared with a constant
+ an indexed column is compared with a constant
using a <literal>></literal> or
<literal><</literal> operator:
</para>
Modified: trunk/refman-5.0/releasenotes-cs-5.0.xml
===================================================================
--- trunk/refman-5.0/releasenotes-cs-5.0.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/releasenotes-cs-5.0.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 737 bytes
@@ -2158,7 +2158,7 @@
View columns were always handled as having implicit
derivation, leading to <literal>illegal mix of collation
errors</literal> for some views in <literal>UNION</literal>
- operations. Now view column column derivation comes from the
+ operations. Now view column derivation comes from the
original expression given in the view definition. (Bug #21505)
</para>
</listitem>
Modified: trunk/refman-5.0/releasenotes-es-5.0.xml
===================================================================
--- trunk/refman-5.0/releasenotes-es-5.0.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/releasenotes-es-5.0.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 737 bytes
@@ -2181,7 +2181,7 @@
View columns were always handled as having implicit
derivation, leading to <literal>illegal mix of collation
errors</literal> for some views in <literal>UNION</literal>
- operations. Now view column column derivation comes from the
+ operations. Now view column derivation comes from the
original expression given in the view definition. (Bug #21505)
</para>
</listitem>
Modified: trunk/refman-5.0/se-innodb.xml
===================================================================
--- trunk/refman-5.0/se-innodb.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/se-innodb.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1244 bytes
@@ -2882,7 +2882,7 @@
at all. MySQL replication is based on the binary log where MySQL
writes SQL statements that modify data. A transaction that fails
(for example, because of a foreign key violation, or because it
- is is rolled back) is not written to the binary log, so it is
+ is rolled back) is not written to the binary log, so it is
not sent to slaves. See <xref linkend="commit"/>.
</para>
@@ -4378,7 +4378,7 @@
<literal>INSERT INTO T SELECT ... FROM S WHERE ...</literal>
sets an exclusive (non-next-key) lock on each row inserted
into <literal>T</literal>. <literal>InnoDB</literal> sets
- shared next-key locks locks on <literal>S</literal>, unless
+ shared next-key locks on <literal>S</literal>, unless
<literal>innodb_locks_unsafe_for_binlog</literal> is
enabled, in which case it does the search on
<literal>S</literal> as a consistent read.
Modified: trunk/refman-5.0/se-merge.xml
===================================================================
--- trunk/refman-5.0/se-merge.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.0/se-merge.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 551 bytes
@@ -193,7 +193,7 @@
<para>
Additionally, the specification for each column in the parent
<literal>MERGE</literal> table and the underlying table are
- compared. For each each column, MySQL checks:
+ compared. For each column, MySQL checks:
</para>
<itemizedlist>
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/apis-c.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 5; 1614 bytes
@@ -3836,9 +3836,8 @@
</para>
<para>
- In MySQL 5.1.12 and later, mysql_insert_id() returns the the
- <emphasis
- role="bold">first</emphasis>
+ In MySQL 5.1.12 and later, mysql_insert_id() returns the
+ <emphasis role="bold">first</emphasis>
automatically generated <literal>AUTO_INCREMENT</literal>
value that was <emphasis>successfully</emphasis> inserted.
In MySQL 5.1.11 and earlier,
@@ -4000,7 +3999,7 @@
<para>
Also note that the value of the SQL
<literal>LAST_INSERT_ID()</literal> function will contain the
- the value of the first automatically generated value that was
+ value of the first automatically generated value that was
successfully inserted (starting from 5.1.12) or the first
automatically generated value if any rows were successfully
inserted (before 5.1.12). Another difference is that
@@ -8748,7 +8747,7 @@
<literal>unsigned</literal>, you should also set the
<literal>is_unsigned</literal> member to true. The table shows the
C variable types that you can use, the corresponding type codes,
- and the SQL data types for which the the supplied value can be
+ and the SQL data types for which the supplied value can be
used without conversion.
</para>
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/charset.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 635 bytes
@@ -2595,7 +2595,7 @@
</para>
<para>
- A special case occurs if if you have old tables from MySQL 4.0 or
+ A special case occurs if you have old tables from MySQL 4.0 or
earlier where a non-binary column contains values that actually
are encoded in a character set different from the server's default
character set. For example, an application might have stored
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/client-utility-programs.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 777 bytes
@@ -784,7 +784,7 @@
specify a table by naming its index file (the file with the
<filename>.MYI</filename> suffix). If you do not invoke
<command>myisam_ftdump</command> in the directory where the
- table files are located, the table or index file name name
+ table files are located, the table or index file name
must be preceded by the pathname to the table's database
directory. Index numbers begin with 0.
</para>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/data-types.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 626 bytes
@@ -1216,7 +1216,7 @@
<para>
The <literal>CHARACTER SET</literal> attribute specifies
the character set, and the <literal>COLLATE</literal>
- attribute specifies a collation for the the character
+ attribute specifies a collation for the character
set. For example:
</para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/database-administration.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1179 bytes
@@ -15758,7 +15758,7 @@
<command>mysql_install_db</command> initializes the MySQL
data directory and creates the system tables that it
contains, if they do not exist. Because the MySQL server,
- <command>mysqld</command>, needs to access the data data
+ <command>mysqld</command>, needs to access the data
directory when it runs later, you should either run
<command>mysql_install_db</command> from the same account
that will be used for running <command>mysqld</command> or
@@ -27065,7 +27065,7 @@
</programlisting>
<para>
- With this approach, you must must execute a separate command
+ With this approach, you must execute a separate command
to load the time zone file for each named zone that the
server needs to know about.
</para>
Modified: trunk/refman-5.1/errors-problems.xml
===================================================================
--- trunk/refman-5.1/errors-problems.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/errors-problems.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 612 bytes
@@ -1201,7 +1201,7 @@
<para>
Another networking issue that can cause this error occurs if
- if the MySQL port (default 3306) is blocked by your
+ the MySQL port (default 3306) is blocked by your
firewall, thus preventing any connections at all to the
MySQL server.
</para>
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/information-schema.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 806 bytes
@@ -4373,7 +4373,7 @@
<emphasis role="bold">Important</emphasis>: The times displayed by
the <literal>STARTS</literal>, <literal>ENDS</literal>, and
<literal>LAST_EXECUTED</literal> columns are currently given in
- terms of Universal Time (GMT or UTC), regardless of the the
+ terms of Universal Time (GMT or UTC), regardless of the
server's time zone setting. (The same is true for the
<literal>starts</literal>, <literal>ends</literal>, and
<literal>last_executed</literal> columns of the
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/installing.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1424 bytes
@@ -2677,7 +2677,7 @@
<para>
<emphasis role="bold">Note</emphasis>: If you are upgrading MySQL
from an existing installation older than MySQL 4.1.5, you must
- first perform the the procedure described in
+ first perform the procedure described in
<xref linkend="windows-upgrading"/>.
</para>
@@ -8317,7 +8317,7 @@
Run <command>configure</command> with the
<option>--disable-grant-options</option> option to cause the
- the <option>--bootstrap</option>,
+ <option>--bootstrap</option>,
<option>--skip-grant-tables</option>, and
<option>--init-file</option> options for
<command>mysqld</command> to be disabled. For Windows, the
@@ -9749,7 +9749,7 @@
<listitem>
<para>
<literal>DISABLE_GRANT_OPTIONS</literal>: Disables the
- the <option>--bootstrap</option>,
+ <option>--bootstrap</option>,
<option>--skip-grant-tables</option>, and
<option>--init-file</option> options for
<command>mysqld</command>. This option is available as
Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/mysql-cluster.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1634 bytes
@@ -5173,7 +5173,7 @@
example, in the case of a data node containing several
gigabytes of data, a period as long as 10−15 minutes
(that is, 600000 to 1000000 milliseconds) might be
- required to to perform a node restart.
+ required to perform a node restart.
</para>
</listitem>
@@ -18223,7 +18223,7 @@
When you add an <literal>UNDO</literal> log file to a log
file group using <literal>ADD UNDOFILE
'<replaceable>filename</replaceable>'</literal>, a file
- with the the name <replaceable>filename</replaceable> is
+ with the name <replaceable>filename</replaceable> is
created in the
<literal>ndb_<replaceable>nodeid</replaceable>_fs</literal>
directory within the <literal>DataDirectory</literal> of
@@ -19687,7 +19687,7 @@
<para>
Memory freed by <literal>DELETE</literal> operations
but still allocated to a specific table can also be
- made made available for general re-use by performing a
+ made available for general re-use by performing a
rolling restart of the cluster. See
<xref linkend="mysql-cluster-rolling-restart"/>.
</para>
Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/news-5.1.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 9, Lines Added: 9, Lines Deleted: 9; 3670 bytes
@@ -1253,7 +1253,7 @@
<listitem>
<para>
- The (undocumented) <literal>UNIQUE_USERS()</literal> and and
+ The (undocumented) <literal>UNIQUE_USERS()</literal> and
<literal>GROUP_UNIQUE_USERS()</literal> functions were
removed. (Bug #22687)
</para>
@@ -2763,7 +2763,7 @@
<para>
<literal>NDB Cluster</literal>: Multiple occurrences of error
conditions were logged with duplicat error messages rather
- than being being reported with a single error message stating
+ than being reported with a single error message stating
that the error was encountered <replaceable>N</replaceable>
times. (Bug #22313)
</para>
@@ -2789,7 +2789,7 @@
<para>
<literal>NDB Cluster</literal>: Some values of
<literal>MaxNoOfTriggers</literal> could cause the server to
- become inaccessible following startup of of the data nodes.
+ become inaccessible following startup of the data nodes.
(Bug #19454)
</para>
</listitem>
@@ -3270,7 +3270,7 @@
View columns were always handled as having implicit
derivation, leading to <literal>illegal mix of collation
errors</literal> for some views in <literal>UNION</literal>
- operations. Now view column column derivation comes from the
+ operations. Now view column derivation comes from the
original expression given in the view definition. (Bug #21505)
</para>
</listitem>
@@ -5019,7 +5019,7 @@
<listitem>
<para>
<literal>LOAD DATA INFILE</literal> no longer causes an
- implicit commit for all storage storage engines. It now causes
+ implicit commit for all storage engines. It now causes
an implicit commit only for tables using the
<literal>NDB</literal> storage engine. (Bug #11151)
</para>
@@ -6680,7 +6680,7 @@
<listitem>
<para>
- Some user-level level errors were being written to the
+ Some user-level errors were being written to the
server's error log, which is for server errors. (Bug #20402)
</para>
</listitem>
@@ -6744,7 +6744,7 @@
A stored procedure with a <literal>CONTINUE</literal> handler
that encountered an error continued to execute a statement
that caused an error, rather with the next statement following
- the the one that caused the error. (Bug #8153)
+ the one that caused the error. (Bug #8153)
</para>
</listitem>
@@ -7970,7 +7970,7 @@
<para>
The length of the pattern string prefix for
<literal>LIKE</literal> operations was calculated incorrectly
- for multi-byte character sets. As a result, the the scanned
+ for multi-byte character sets. As a result, the scanned
range was wider than necessary if the prefix contained any
multi-byte characters, and rows could be missing from the
result set. (Bug #16674, Bug #18359)
@@ -8856,7 +8856,7 @@
<listitem>
<para>
<literal>NDB Cluster</literal>: Renaming a table in such a way
- as to move it to to a different database failed to move the
+ as to move it to a different database failed to move the
table's indexes. (Bug #19967)
</para>
</listitem>
Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/optimization.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 623 bytes
@@ -1693,7 +1693,7 @@
<para>
However, a condition pushdown may also be employed when
- an indexed column column is compared with a constant
+ an indexed column is compared with a constant
using a <literal>></literal> or
<literal><</literal> operator:
</para>
Modified: trunk/refman-5.1/partitioning-guide.xml
===================================================================
--- trunk/refman-5.1/partitioning-guide.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/partitioning-guide.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 670 bytes
@@ -220,7 +220,7 @@
<para>
You can also place your most critical data on highly available
- storage media, and less important data on devices which which do
+ storage media, and less important data on devices which do
not necessarily guarantee the same level of reliability (and so
are not as costly). This can help to make hardware expenditures
more effective.
Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/replication-configuration.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 603 bytes
@@ -222,7 +222,7 @@
<listitem>
<para>
- If you you are setting up additional slaves to an existing
+ If you are setting up additional slaves to an existing
replication environment then you can setup the slaves without
affecting the master. See
<xref
Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/restrictions.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 718 bytes
@@ -78,7 +78,7 @@
SQL prepared statements (<literal>PREPARE</literal>,
<literal>EXECUTE</literal>, <literal>DEALLOCATE
PREPARE</literal>). Implication: You cannot use dynamic SQL
- within stored stored functions or triggers (where you construct dynamically
+ within stored functions or triggers (where you construct dynamically
statements as strings and then execute them).
</para>
</listitem>
Modified: trunk/refman-5.1/se-federated.xml
===================================================================
--- trunk/refman-5.1/se-federated.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/se-federated.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1001 bytes
@@ -67,7 +67,7 @@
<para>
A <emphasis>remote server</emphasis> with a database table,
which in turn consists of the table definition (stored in the
- <filename>.frm</filename> file) and the associated table
+ <filename>.frm</filename> file) and the associated
table. The table type of the remote table may be any type
supported by the remote <literal>mysqld</literal> server,
including <literal>MyISAM</literal> or
@@ -224,7 +224,7 @@
<note>
<para>
When you create the local table is <emphasis>must</emphasis>
- have have an identical definition to the remote table.
+ have an identical definition to the remote table.
</para>
</note>
Modified: trunk/refman-5.1/se-innodb.xml
===================================================================
--- trunk/refman-5.1/se-innodb.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/se-innodb.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1244 bytes
@@ -2860,7 +2860,7 @@
at all. MySQL replication is based on the binary log where MySQL
writes SQL statements that modify data. A transaction that fails
(for example, because of a foreign key violation, or because it
- is is rolled back) is not written to the binary log, so it is
+ is rolled back) is not written to the binary log, so it is
not sent to slaves. See <xref linkend="commit"/>.
</para>
@@ -4356,7 +4356,7 @@
<literal>INSERT INTO T SELECT ... FROM S WHERE ...</literal>
sets an exclusive (non-next-key) lock on each row inserted
into <literal>T</literal>. <literal>InnoDB</literal> sets
- shared next-key locks locks on <literal>S</literal>, unless
+ shared next-key locks on <literal>S</literal>, unless
<literal>innodb_locks_unsafe_for_binlog</literal> is
enabled, in which case it does the search on
<literal>S</literal> as a consistent read.
Modified: trunk/refman-5.1/se-merge.xml
===================================================================
--- trunk/refman-5.1/se-merge.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/se-merge.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 551 bytes
@@ -176,7 +176,7 @@
<para>
Additionally, the specification for each column in the parent
<literal>MERGE</literal> table and the underlying table are
- compared. For each each column, MySQL checks:
+ compared. For each column, MySQL checks:
</para>
<itemizedlist>
Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-5.1/storage-engines.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 664 bytes
@@ -827,7 +827,7 @@
<para>
Third party engines are not supported by MySQL. For further
information, documentation, installation guides, bug reporting
- or for any any help or assistance with these engines, please
+ or for any help or assistance with these engines, please
contact the developer of the engine directly.
</para>
</note>
Modified: trunk/refman-common/connector-j.xml
===================================================================
--- trunk/refman-common/connector-j.xml 2007-03-08 03:29:17 UTC (rev 5247)
+++ trunk/refman-common/connector-j.xml 2007-03-08 03:29:53 UTC (rev 5248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 552 bytes
@@ -2181,7 +2181,7 @@
<programlisting>SELECT id, data as 'data' from blobtable</programlisting>
<para>
- For this to work, you must also follow follow these rules:
+ For this to work, you must also follow these rules:
</para>
<itemizedlist>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5248 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 8 Mar |
