Author: paul
Date: 2006-02-20 16:23:33 +0100 (Mon, 20 Feb 2006)
New Revision: 1404
Log:
r7916@frost: paul | 2006-02-20 09:19:30 -0600
Tweaks.
Reformat.
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/charset.xml
trunk/refman-4.1/connector-j.xml
trunk/refman-4.1/connector-php.xml
trunk/refman-4.1/connectors.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/functions.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/ndbcluster.xml
trunk/refman-4.1/optimization.xml
trunk/refman-4.1/replication.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-4.1/tutorial.xml
trunk/refman-5.0/connector-j.xml
trunk/refman-5.0/connector-php.xml
trunk/refman-5.0/connectors.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.0/optimization.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/tutorial.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/connector-j.xml
trunk/refman-5.1/connector-php.xml
trunk/refman-5.1/connectors.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/events.xml
trunk/refman-5.1/functions.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/ndbcluster.xml
trunk/refman-5.1/optimization.xml
trunk/refman-5.1/partitioning.xml
trunk/refman-5.1/replication.xml
trunk/refman-5.1/restrictions.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.1/tutorial.xml
trunk/refman-common/news-4.1.xml
trunk/refman-common/news-5.0.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7912
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3372
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7916
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3372
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/apis.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -13003,7 +13003,7 @@
You can find information why you should preferably use the
extensions provided by MySQL on that page.
</para>
-
+
<section id="php-problems">
<title>&title-php-problems;</title>
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/charset.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -52,8 +52,7 @@
<emphasis role="bold">Note</emphasis>: The
<literal>NDBCluster</literal> storage engine in MySQL 4.1 (available
beginning with MySQL 4.1.3-Max) provides limited character set and
- collation support; see
- <xref linkend="mysql-cluster-limitations"/>.
+ collation support; see <xref linkend="mysql-cluster-limitations"/>.
</para>
<para>
Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/connector-j.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1244,7 +1244,7 @@
<para>
New SQLState Codes — Connector/J 3.1 uses SQL:1999
SQLState codes returned by the MySQL server (if
- supported), which are different than the
+ supported), which are different from the
<quote>legacy</quote> X/Open state codes that Connector/J
3.0 uses. If connected to a MySQL server older than
MySQL-4.1.0 (the oldest version to return SQLStates as
@@ -4864,8 +4864,8 @@
</itemizedlist>
<para>
- If you need to use a JDBC URL that is different than
- 'jdbc:mysql:///test', then override the method
+ If you need to use a JDBC URL that is different from
+ 'jdbc:mysql:///test', override the method
<methodname>getUrl()</methodname> as well.
</para>
Modified: trunk/refman-4.1/connector-php.xml
===================================================================
--- trunk/refman-4.1/connector-php.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/connector-php.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -14,15 +14,16 @@
<title>&title-connector-php;</title>
<para>
- The PHP distribution and documentation are available from the PHP Web site.
- MySQL provides the <literal>mysql</literal> and <literal>mysqli</literal>
- extensions for MySQL versions as of 4.1.16 for the Windows operating system on
- <ulink url="http://dev.mysql.com/downloads/connector/php/"/>.
- You can find
- information why you should preferably use the extensions provided by MySQL
- on that page. For platforms other than Windows, you should use the
- <literal>mysql</literal> or <literal>mysqli</literal> extensions shipped
- with the PHP sources. See <xref linkend="php"/>.
+ The PHP distribution and documentation are available from the PHP
+ Web site. MySQL provides the <literal>mysql</literal> and
+ <literal>mysqli</literal> extensions for MySQL versions as of 4.1.16
+ for the Windows operating system on
+ <ulink url="http://dev.mysql.com/downloads/connector/php/"/>. You
+ can find information why you should preferably use the extensions
+ provided by MySQL on that page. For platforms other than Windows,
+ you should use the <literal>mysql</literal> or
+ <literal>mysqli</literal> extensions shipped with the PHP sources.
+ See <xref linkend="php"/>.
</para>
</section>
Modified: trunk/refman-4.1/connectors.xml
===================================================================
--- trunk/refman-4.1/connectors.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/connectors.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -40,5 +40,5 @@
<xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
+
</chapter>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/database-administration.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -11486,7 +11486,7 @@
<listitem>
<para>
Have your application connect to the database using a
- different username than the one you use for
+ username different from the one you use for
administrative purposes. Do not give your applications
any access privileges they do not need.
</para>
@@ -20633,11 +20633,11 @@
</para>
<para>
- If the client is compiled with different paths than where the
+ If the client is compiled with paths that differ from where the
server is installed and the user who configured MySQL didn't
include all character sets in the MySQL binary, you must tell
the client where it can find the additional character sets it
- needs if the server runs with a different character set than the
+ needs if the server runs with a different character set from the
client.
</para>
@@ -23351,7 +23351,7 @@
<para>
To connect with a client program to a MySQL server that is
- listening to different network interfaces than those compiled
+ listening to different network interfaces from those compiled
into your client, you can use one of the following methods:
</para>
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/functions.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -13290,7 +13290,7 @@
<para>
The value indicates the username you specified when
connecting to the server, and the client host from which you
- connected. The value can be different than that of
+ connected. The value can be different from that of
<literal>CURRENT_USER()</literal>.
</para>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/installing.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -385,7 +385,7 @@
The capability of the kernel and the thread library to take
advantage of symmetric multi-processor (SMP) systems. In
other words, when a process creates a thread, it should be
- possible for that thread to run on a different CPU than the
+ possible for that thread to run on a CPU different from the
original process.
</para>
</listitem>
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/ndbcluster.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1339,7 +1339,7 @@
</remark>
<para>
- Working with data in MySQL Cluster is not much different than
+ Working with data in MySQL Cluster is not much different from
doing so in MySQL without Cluster. There are two points to keep
in mind:
</para>
@@ -1519,7 +1519,7 @@
<para>
Running <literal>SELECT</literal> queries on the SQL node is no
- different than running them on any other instance of a MySQL
+ different from running them on any other instance of a MySQL
server. To run queries from the command line, you first need to
log in to the MySQL Monitor in the usual way (specify the
<literal>root</literal> password at the <literal>Enter
Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/optimization.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -5782,7 +5782,7 @@
</para>
<para>
- Hash indexes have somewhat different characteristics than those
+ Hash indexes have somewhat different characteristics from those
just discussed:
</para>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/replication.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -4366,7 +4366,7 @@
co-master 2, client B could make an update to co-master 2 that
makes the update of client A work differently than it did on
co-master 1. Thus, when the update of client A makes it to
- co-master 2, it produces tables that are different than what you
+ co-master 2, it produces tables that are different from what you
have on co-master 1, even after all the updates from co-master 2
have also propagated. This means that you should not chain two
servers together in a two-way replication relationship unless you
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/sql-syntax.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -12962,7 +12962,7 @@
<literal>InnoDB</literal> tables are checked. If set to 0,
they are ignored. Disabling foreign key checking can be
useful for reloading <literal>InnoDB</literal> tables in an
- order different than that required by their parent/child
+ order different from that required by their parent/child
relationships. This variable was added in MySQL 3.23.52. See
<xref linkend="innodb-foreign-key-constraints"/>.
</para>
Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-4.1/tutorial.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1971,7 +1971,7 @@
The <literal>NULL</literal> value can be surprising until you
get used to it. Conceptually, <literal>NULL</literal> means
<quote>a missing unknown value</quote> and it is treated
- somewhat differently than other values. To test for
+ somewhat differently from other values. To test for
<literal>NULL</literal>, you cannot use the arithmetic
comparison operators such as <literal>=</literal>,
<literal><</literal>, or <literal><></literal>. To
Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/connector-j.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1244,7 +1244,7 @@
<para>
New SQLState Codes — Connector/J 3.1 uses SQL:1999
SQLState codes returned by the MySQL server (if
- supported), which are different than the
+ supported), which are different from the
<quote>legacy</quote> X/Open state codes that Connector/J
3.0 uses. If connected to a MySQL server older than
MySQL-4.1.0 (the oldest version to return SQLStates as
@@ -4864,8 +4864,8 @@
</itemizedlist>
<para>
- If you need to use a JDBC URL that is different than
- 'jdbc:mysql:///test', then override the method
+ If you need to use a JDBC URL that is different from
+ 'jdbc:mysql:///test', override the method
<methodname>getUrl()</methodname> as well.
</para>
Modified: trunk/refman-5.0/connector-php.xml
===================================================================
--- trunk/refman-5.0/connector-php.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/connector-php.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -14,16 +14,16 @@
<title>&title-connector-php;</title>
<para>
- The PHP distribution and documentation are available from the PHP Web site.
- MySQL provides the <literal>mysql</literal> and <literal>mysqli</literal>
- extensions for the Windows operating system for MySQL versions as of
- 5.0.18 on
- <ulink url="http://dev.mysql.com/downloads/connector/php/"/>.
- You can find
- information why you should preferably use the extensions provided by MySQL
- on that page. For platforms other than Windows, you should use the
- <literal>mysql</literal> or <literal>mysqli</literal> extensions shipped
- with the PHP sources. See <xref linkend="php"/>.
+ The PHP distribution and documentation are available from the PHP
+ Web site. MySQL provides the <literal>mysql</literal> and
+ <literal>mysqli</literal> extensions for the Windows operating
+ system for MySQL versions as of 5.0.18 on
+ <ulink url="http://dev.mysql.com/downloads/connector/php/"/>. You
+ can find information why you should preferably use the extensions
+ provided by MySQL on that page. For platforms other than Windows,
+ you should use the <literal>mysql</literal> or
+ <literal>mysqli</literal> extensions shipped with the PHP sources.
+ See <xref linkend="php"/>.
</para>
</section>
Modified: trunk/refman-5.0/connectors.xml
===================================================================
--- trunk/refman-5.0/connectors.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/connectors.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -40,5 +40,5 @@
<xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
+
</chapter>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/database-administration.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -13777,7 +13777,7 @@
<listitem>
<para>
Have your application connect to the database using a
- different username than the one you use for
+ username different from the one you use for
administrative purposes. Do not give your applications
any access privileges they do not need.
</para>
@@ -23097,11 +23097,11 @@
</para>
<para>
- If the client is compiled with different paths than where the
+ If the client is compiled with paths that differ from where the
server is installed and the user who configured MySQL didn't
include all character sets in the MySQL binary, you must tell
the client where it can find the additional character sets it
- needs if the server runs with a different character set than the
+ needs if the server runs with a different character set from the
client.
</para>
@@ -25275,7 +25275,7 @@
</remark>
<remark>
- If you specify a service name different than @code{MySQL}
+ If you specify a service name different from @code{MySQL}
after the
</remark>
@@ -25626,7 +25626,7 @@
<para>
To connect with a client program to a MySQL server that is
- listening to different network interfaces than those compiled
+ listening to different network interfaces from those compiled
into your client, you can use one of the following methods:
</para>
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/functions.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -13345,7 +13345,7 @@
<para>
The value indicates the username you specified when
connecting to the server, and the client host from which you
- connected. The value can be different than that of
+ connected. The value can be different from that of
<literal>CURRENT_USER()</literal>.
</para>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/installing.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -385,7 +385,7 @@
The capability of the kernel and the thread library to take
advantage of symmetric multi-processor (SMP) systems. In
other words, when a process creates a thread, it should be
- possible for that thread to run on a different CPU than the
+ possible for that thread to run on a CPU different from the
original process.
</para>
</listitem>
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/ndbcluster.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1339,7 +1339,7 @@
</remark>
<para>
- Working with data in MySQL Cluster is not much different than
+ Working with data in MySQL Cluster is not much different from
doing so in MySQL without Cluster. There are two points to keep
in mind:
</para>
@@ -1521,7 +1521,7 @@
<para>
Running <literal>SELECT</literal> queries on the SQL node is no
- different than running them on any other instance of a MySQL
+ different from running them on any other instance of a MySQL
server. To run queries from the command line, you first need to
log in to the MySQL Monitor in the usual way (specify the
<literal>root</literal> password at the <literal>Enter
Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/optimization.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -7273,7 +7273,7 @@
</para>
<para>
- Hash indexes have somewhat different characteristics than those
+ Hash indexes have somewhat different characteristics from those
just discussed:
</para>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/replication.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1417,7 +1417,7 @@
<para>
The binary log format as implemented in MySQL ¤t-series; is
- considerably different than that used in previous versions. Major
+ considerably different from that used in previous versions. Major
changes were made in MySQL 5.0.3 (for improvements to handling of
character sets and <literal>LOAD DATA INFILE</literal>) and 5.0.4
(for improvements to handling of time zones).
@@ -4244,7 +4244,7 @@
co-master 2, client B could make an update to co-master 2 that
makes the update of client A work differently than it did on
co-master 1. Thus, when the update of client A makes it to
- co-master 2, it produces tables that are different than what you
+ co-master 2, it produces tables that are different from what you
have on co-master 1, even after all the updates from co-master 2
have also propagated. This means that you should not chain two
servers together in a two-way replication relationship unless you
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/sql-syntax.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -23,7 +23,7 @@
<listitem>
<para>
- <literal>EXPLAIN</literal> statement is discussed in
+ The <literal>EXPLAIN</literal> statement is discussed in
<xref linkend="optimization"/>.
</para>
</listitem>
@@ -14233,7 +14233,7 @@
<literal>InnoDB</literal> tables are checked. If set to 0,
they are ignored. Disabling foreign key checking can be
useful for reloading <literal>InnoDB</literal> tables in an
- order different than that required by their parent/child
+ order different from that required by their parent/child
relationships. See
<xref linkend="innodb-foreign-key-constraints"/>.
</para>
Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.0/tutorial.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1974,7 +1974,7 @@
The <literal>NULL</literal> value can be surprising until you
get used to it. Conceptually, <literal>NULL</literal> means
<quote>a missing unknown value</quote> and it is treated
- somewhat differently than other values. To test for
+ somewhat differently from other values. To test for
<literal>NULL</literal>, you cannot use the arithmetic
comparison operators such as <literal>=</literal>,
<literal><</literal>, or <literal><></literal>. To
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/apis.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -12960,7 +12960,7 @@
You can find information why you should preferably use the
extensions provided by MySQL on that page.
</para>
-
+
<section id="php-problems">
<title>&title-php-problems;</title>
Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/connector-j.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1247,7 +1247,7 @@
<para>
New SQLState Codes — Connector/J 3.1 uses SQL:1999
SQLState codes returned by the MySQL server (if
- supported), which are different than the
+ supported), which are different from the
<quote>legacy</quote> X/Open state codes that Connector/J
3.0 uses. If connected to a MySQL server older than
MySQL-4.1.0 (the oldest version to return SQLStates as
@@ -4867,8 +4867,8 @@
</itemizedlist>
<para>
- If you need to use a JDBC URL that is different than
- 'jdbc:mysql:///test', then override the method
+ If you need to use a JDBC URL that is different from
+ 'jdbc:mysql:///test', override the method
<methodname>getUrl()</methodname> as well.
</para>
Modified: trunk/refman-5.1/connector-php.xml
===================================================================
--- trunk/refman-5.1/connector-php.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/connector-php.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -14,15 +14,16 @@
<title>&title-connector-php;</title>
<para>
- The PHP distribution and documentation are available from the PHP Web site.
- MySQL provides the <literal>mysql</literal> and <literal>mysqli</literal>
- extensions for the Windows operating system on
- <ulink url="http://dev.mysql.com/downloads/connector/php/"/>.
- You can find
- information why you should preferably use the extensions provided by MySQL
- on that page. For platforms other than Windows, you should use the
- <literal>mysql</literal> or <literal>mysqli</literal> extensions shipped
- with the PHP sources. See <xref linkend="php"/>.
+ The PHP distribution and documentation are available from the PHP
+ Web site. MySQL provides the <literal>mysql</literal> and
+ <literal>mysqli</literal> extensions for the Windows operating
+ system on
+ <ulink url="http://dev.mysql.com/downloads/connector/php/"/>. You
+ can find information why you should preferably use the extensions
+ provided by MySQL on that page. For platforms other than Windows,
+ you should use the <literal>mysql</literal> or
+ <literal>mysqli</literal> extensions shipped with the PHP sources.
+ See <xref linkend="php"/>.
</para>
</section>
Modified: trunk/refman-5.1/connectors.xml
===================================================================
--- trunk/refman-5.1/connectors.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/connectors.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -38,7 +38,7 @@
<xi:include href="connector-j.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
+
<xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</chapter>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/database-administration.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -13607,7 +13607,7 @@
<listitem>
<para>
Have your application connect to the database using a
- different username than the one you use for
+ username different from the one you use for
administrative purposes. Do not give your applications
any access privileges they do not need.
</para>
@@ -22938,11 +22938,11 @@
</para>
<para>
- If the client is compiled with different paths than where the
+ If the client is compiled with paths that differ from where the
server is installed and the user who configured MySQL didn't
include all character sets in the MySQL binary, you must tell
the client where it can find the additional character sets it
- needs if the server runs with a different character set than the
+ needs if the server runs with a different character set from the
client.
</para>
@@ -25290,7 +25290,7 @@
</remark>
<remark>
- If you specify a service name different than @code{MySQL}
+ If you specify a service name different from @code{MySQL}
after the
</remark>
@@ -25641,7 +25641,7 @@
<para>
To connect with a client program to a MySQL server that is
- listening to different network interfaces than those compiled
+ listening to different network interfaces from those compiled
into your client, you can use one of the following methods:
</para>
Modified: trunk/refman-5.1/events.xml
===================================================================
--- trunk/refman-5.1/events.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/events.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -166,7 +166,7 @@
event creation and modification statements fail with an
appropriate error message. <emphasis>A user may include
statements in an event's action which require privileges that
- the user does not actually have</emphasis>. The event creation
+ the user does not actually have</emphasis>. The event creation
or modification statement succeeds but the event's action
fails. See <xref linkend="events-privileges"/> for details.
</para>
@@ -338,7 +338,7 @@
<literal>DROP EVENT</literal> statement. See
<xref linkend="events-drop"/>. (Whether an event persists past
the end of its schedule also depends on its <literal>ON
- COMPLETION</literal> clause, if it has one. See
+ COMPLETION</literal> clause, if it has one. See
<xref linkend="events-create"/>.)
</para>
@@ -443,8 +443,8 @@
<replaceable>event_name</replaceable>, then the default
(current) schema is assumed. The definer is always the current
MySQL user. <emphasis>It is possible for two different users to
- create different events having the same name on the same
- database schema</emphasis>. For example, the users
+ create different events having the same name on the same
+ database schema</emphasis>. For example, the users
<literal>jon@ghidora</literal> and
<literal>stefan@athena</literal> may each create an event named
<literal>myevent</literal> on the database schema named
@@ -562,7 +562,7 @@
(<literal>+ INTERVAL</literal> is <emphasis>not</emphasis>
used with <literal>EVERY</literal>.) For example,
<literal>EVERY 6 WEEK</literal> means <quote>every six
- weeks</quote>.
+ weeks</quote>.
</para>
<para>
@@ -1362,14 +1362,14 @@
SCHEMA</literal> drops all events associated with the dropped
schema.
</para>
-
- <para>
- As with stored routines, events are not migrated to the new
- schema by the <literal>RENAME SCHEMA</literal> (or
- <literal>RENAME DATABASE</literal>) statement. See
- <xref linkend="rename-database"/>.
- </para>
+ <para>
+ As with stored routines, events are not migrated to the new schema
+ by the <literal>RENAME SCHEMA</literal> (or <literal>RENAME
+ DATABASE</literal>) statement. See
+ <xref linkend="rename-database"/>.
+ </para>
+
</section>
</chapter>
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/functions.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -13755,7 +13755,7 @@
<para>
The value indicates the username you specified when
connecting to the server, and the client host from which you
- connected. The value can be different than that of
+ connected. The value can be different from that of
<literal>CURRENT_USER()</literal>.
</para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/installing.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -385,7 +385,7 @@
The capability of the kernel and the thread library to take
advantage of symmetric multi-processor (SMP) systems. In
other words, when a process creates a thread, it should be
- possible for that thread to run on a different CPU than the
+ possible for that thread to run on a CPU different from the
original process.
</para>
</listitem>
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/ndbcluster.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1323,7 +1323,7 @@
</remark>
<para>
- Working with data in MySQL Cluster is not much different than
+ Working with data in MySQL Cluster is not much different from
doing so in MySQL without Cluster. There are two points to keep
in mind:
</para>
@@ -1503,7 +1503,7 @@
<para>
Running <literal>SELECT</literal> queries on the SQL node is no
- different than running them on any other instance of a MySQL
+ different from running them on any other instance of a MySQL
server. To run queries from the command line, you first need to
log in to the MySQL Monitor in the usual way (specify the
<literal>root</literal> password at the <literal>Enter
@@ -9051,7 +9051,7 @@
<para>
Setting up replication with two channels is not radically
- different than setting up a single replication channel. First,
+ different from setting up a single replication channel. First,
the <command>mysqld</command> processes for the primary and
secondary replication masters must be started, followed by those
for the primary and secondary slaves. Then the replication
Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/optimization.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -7281,7 +7281,7 @@
</para>
<para>
- Hash indexes have somewhat different characteristics than those
+ Hash indexes have somewhat different characteristics from those
just discussed:
</para>
Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/partitioning.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -46,7 +46,7 @@
user that incompatible partitioned tables have been found by the
server.
</para>
-
+
<para>
<emphasis role="bold">Important</emphasis>: If you are using
partitioned tables which were created in MySQL 5.1.5 or earlier, be
@@ -66,7 +66,7 @@
discrepancies in this chapter. Before filing bug reports, we
encourage you to check the following resources:
</para>
-
+
<para>
<emphasis role="bold">Additional Resources</emphasis>:
</para>
@@ -3371,14 +3371,14 @@
storage engine.
</para>
</listitem>
-
+
<listitem>
<para>
Partitioned tables do not support <literal>FULLTEXT</literal>
indexes.
</para>
</listitem>
-
+
<listitem>
<para>
Partitioned tables do not support <literal>GEOMETRY</literal>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/replication.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1598,7 +1598,7 @@
<para>
The binary log format as implemented in MySQL ¤t-series; is
- considerably different than that used in previous versions,
+ considerably different from that used in previous versions,
especially with regard to handling of character sets,
<literal>LOAD DATA INFILE</literal>, and time zones.
</para>
@@ -4458,7 +4458,7 @@
co-master 2, client B could make an update to co-master 2 that
makes the update of client A work differently than it did on
co-master 1. Thus, when the update of client A makes it to
- co-master 2, it produces tables that are different than what you
+ co-master 2, it produces tables that are different from what you
have on co-master 1, even after all the updates from co-master 2
have also propagated. This means that you should not chain two
servers together in a two-way replication relationship unless you
Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/restrictions.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -239,10 +239,10 @@
which cannot return a value. To exit a trigger immediately, use
the <literal>LEAVE</literal> statement.
</para>
-
+
<para>
The <literal>RENAME DATABASE</literal> statement does not migrate
- stored routines to the new schema name. See
+ stored routines to the new schema name. See
<xref linkend="rename-database"/>.
</para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/sql-syntax.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -23,7 +23,7 @@
<listitem>
<para>
- <literal>EXPLAIN</literal> statement is discussed in
+ The <literal>EXPLAIN</literal> statement is discussed in
<xref linkend="optimization"/>.
</para>
</listitem>
@@ -3692,13 +3692,14 @@
<literal>RENAME DATABASE</literal> does not change any account
privileges listed in the system tables.
</para>
-
+
<para>
This statement does not migrate any stored routines or events to
- the new schema name. This means that:
+ the new schema name. This means that:
</para>
-
+
<itemizedlist>
+
<listitem>
<para>
For stored routines, it does not change any values in the
@@ -3708,18 +3709,18 @@
<literal>mysql.proc</literal> table.
</para>
</listitem>
-
+
<listitem>
<para>
For events, it does not change any values in the
<literal>EVENT_SCHEMA</literal> column of the
<literal>INFORMATION_SCHEMA.EVENTS</literal> table, or in
the <literal>db</literal> column of the
- <literal>mysql.event</literal> table.
+ <literal>mysql.event</literal> table.
</para>
</listitem>
+
</itemizedlist>
-
<remark role="help-description-end"/>
@@ -14794,7 +14795,7 @@
<literal>InnoDB</literal> tables are checked. If set to 0,
they are ignored. Disabling foreign key checking can be
useful for reloading <literal>InnoDB</literal> tables in an
- order different than that required by their parent/child
+ order different from that required by their parent/child
relationships. See
<xref linkend="innodb-foreign-key-constraints"/>.
</para>
Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-5.1/tutorial.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -1968,7 +1968,7 @@
The <literal>NULL</literal> value can be surprising until you
get used to it. Conceptually, <literal>NULL</literal> means
<quote>a missing unknown value</quote> and it is treated
- somewhat differently than other values. To test for
+ somewhat differently from other values. To test for
<literal>NULL</literal>, you cannot use the arithmetic
comparison operators such as <literal>=</literal>,
<literal><</literal>, or <literal><></literal>. To
Modified: trunk/refman-common/news-4.1.xml
===================================================================
--- trunk/refman-common/news-4.1.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-common/news-4.1.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -2398,7 +2398,7 @@
<listitem>
<para>
<literal>GROUP_CONCAT()</literal> sometimes returned a result
- with a different collation than that of its arguments. (Bug
+ with a different collation from that of its arguments. (Bug
#10201)
</para>
</listitem>
@@ -3539,7 +3539,7 @@
<literal>ALTER TABLE ... ENABLE INDEXES</literal> treated
<literal>NULL</literal> values as equal when collecting index
statistics for <literal>MyISAM</literal> tables, resulting in
- different statistics than generated by <literal>ANALYZE
+ different statistics from those generated by <literal>ANALYZE
TABLE</literal> and causing the optimizer to make poor index
choices later. The same problem occurred for bulk insert
statistics collection. Now <literal>NULL</literal> values are
@@ -3989,7 +3989,7 @@
<para>
<literal>SELECT
ROUND(<replaceable>expr</replaceable>)</literal> produced a
- different result than <literal>CREATE TABLE ... SELECT
+ different result from <literal>CREATE TABLE ... SELECT
ROUND(<replaceable>expr</replaceable>)</literal>. (Bug #9837)
</para>
</listitem>
Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml 2006-02-20 15:23:16 UTC (rev 1403)
+++ trunk/refman-common/news-5.0.xml 2006-02-20 15:23:33 UTC (rev 1404)
@@ -5692,7 +5692,7 @@
<listitem>
<para>
<literal>GROUP_CONCAT()</literal> sometimes returned a result
- with a different collation than that of its arguments. (Bug
+ with a different collation from that of its arguments. (Bug
#10201)
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1404 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 20 Feb |
