Author: paul
Date: 2006-03-22 18:24:40 +0100 (Wed, 22 Mar 2006)
New Revision: 1642
Log:
r8875@frost: paul | 2006-03-22 11:20:57 -0600
Fold in proof corrections.
Modified:
trunk/
trunk/refman-4.1/introduction.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.1/introduction.xml
trunk/refman-common/maxdb.en.xml
trunk/refman-common/what-is.en.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8815
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4044
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8875
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4044
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2006-03-21 21:04:44 UTC (rev 1641)
+++ trunk/refman-4.1/introduction.xml 2006-03-22 17:24:40 UTC (rev 1642)
@@ -1441,7 +1441,7 @@
<listitem>
<para>
- Use of ‘<literal>\</literal>’ as an escape
+ ‘<literal>\</literal>’ is the escape
character in strings.
</para>
</listitem>
@@ -1454,7 +1454,7 @@
SQL servers provide the same functionality but call this
<literal>User space</literal>. MySQL Server doesn't
support tablespaces such as used in statements like
- this: <literal>CREATE TABLE ralph.my_table...IN
+ this: <literal>CREATE TABLE ralph.my_table ... IN
my_tablespace</literal>.
</para>
</listitem>
@@ -1615,7 +1615,7 @@
<listitem>
<para>
- <literal>INSERT INTO ... SET
+ <literal>INSERT INTO <literal>tbl_name</literal> SET
<replaceable>col_name</replaceable> = ...</literal>
syntax.
</para>
@@ -1761,7 +1761,7 @@
<listitem>
<para>
String comparisons are case-insensitive by default, with
- sort ordering determined by the current character set,
+ sort ordering determined by collation of the current character set,
which is <literal>latin1</literal> (cp1252 West
European) by default. If you don't like this, you should
declare your columns with the <literal>BINARY</literal>
@@ -2499,7 +2499,7 @@
<literal>INSERT</literal> and <literal>SELECT</literal>
operations. In this case, the table has no holes in the middle
and the inserts can be performed concurrently with retrievals.
- See <xref linkend="table-locking"/>.)
+ See <xref linkend="concurrent-inserts"/>.)
</para>
<para>
@@ -2585,7 +2585,7 @@
</para>
<programlisting>
-SELECT * FROM t1, t2 WHERE t1.id = t2.id;
+SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id;
</programlisting>
<para>
@@ -2917,7 +2917,7 @@
If you try to store an out of range value into a numeric
column, MySQL Server instead stores zero, the smallest
possible value, or the largest possible value, whichever
- is closest to the invalid value. column.
+ is closest to the invalid value.
</para>
</listitem>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2006-03-21 21:04:44 UTC (rev 1641)
+++ trunk/refman-5.0/introduction.xml 2006-03-22 17:24:40 UTC (rev 1642)
@@ -551,8 +551,8 @@
relations in the <literal>WHERE</literal> clause
involved the same key.) This also applies to other
one-to-one comparison operators
- (<literal>></literal>, <literal><</literal>, so
- on), including <literal>=</literal> and the
+ (<literal>></literal>, <literal><</literal>, and
+ so on), including <literal>=</literal> and the
<literal>IN</literal> operator. This means that MySQL
can use multiple indexes in retrieving results for
conditions such as <literal>WHERE key1 > 4 OR key2
@@ -1067,7 +1067,7 @@
<listitem>
<para>
- Use of ‘<literal>\</literal>’ as an escape
+ ‘<literal>\</literal>’ is the escape
character in strings.
</para>
</listitem>
@@ -1080,7 +1080,7 @@
SQL servers provide the same functionality but call this
<literal>User space</literal>. MySQL Server doesn't
support tablespaces such as used in statements like
- this: <literal>CREATE TABLE ralph.my_table...IN
+ this: <literal>CREATE TABLE ralph.my_table ... IN
my_tablespace</literal>.
</para>
</listitem>
@@ -1246,7 +1246,7 @@
<listitem>
<para>
- <literal>INSERT INTO ... SET
+ <literal>INSERT INTO <literal>tbl_name</literal> SET
<replaceable>col_name</replaceable> = ...</literal>
syntax.
</para>
@@ -1392,13 +1392,14 @@
<listitem>
<para>
String comparisons are case-insensitive by default, with
- sort ordering determined by the current character set,
- which is <literal>latin1</literal> (cp1252 West
- European) by default. If you don't like this, you should
- declare your columns with the <literal>BINARY</literal>
- attribute or use the <literal>BINARY</literal> cast,
- which causes comparisons to be done using the underlying
- character code values rather then a lexical ordering.
+ sort ordering determined by collation of the current
+ character set, which is <literal>latin1</literal>
+ (cp1252 West European) by default. If you don't like
+ this, you should declare your columns with the
+ <literal>BINARY</literal> attribute or use the
+ <literal>BINARY</literal> cast, which causes comparisons
+ to be done using the underlying character code values
+ rather then a lexical ordering.
</para>
</listitem>
@@ -2146,7 +2147,7 @@
<literal>INSERT</literal> and <literal>SELECT</literal>
operations. In this case, the table has no holes in the middle
and the inserts can be performed concurrently with retrievals.
- See <xref linkend="table-locking"/>.)
+ See <xref linkend="concurrent-inserts"/>.)
</para>
<para>
@@ -2232,7 +2233,7 @@
</para>
<programlisting>
-SELECT * FROM t1, t2 WHERE t1.id = t2.id;
+SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id;
</programlisting>
<para>
@@ -2599,7 +2600,7 @@
If you try to store an out of range value into a numeric
column, MySQL Server instead stores zero, the smallest
possible value, or the largest possible value, whichever
- is closest to the invalid value. column.
+ is closest to the invalid value.
</para>
</listitem>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2006-03-21 21:04:44 UTC (rev 1641)
+++ trunk/refman-5.1/introduction.xml 2006-03-22 17:24:40 UTC (rev 1642)
@@ -281,8 +281,8 @@
<para>
The maturity level of the release series covered in this manual
- (¤t-series;) is ¤t-maturity;.
- Information about maturity levels can be found in
+ (¤t-series;) is ¤t-maturity;. Information about
+ maturity levels can be found in
<xref linkend="choosing-version"/>.
</para>
@@ -608,7 +608,7 @@
</listitem>
</itemizedlist>
-->
-
+
<itemizedlist>
<listitem>
@@ -1060,7 +1060,7 @@
<listitem>
<para>
- Use of ‘<literal>\</literal>’ as an escape
+ ‘<literal>\</literal>’ is the escape
character in strings.
</para>
</listitem>
@@ -1073,7 +1073,7 @@
SQL servers provide the same functionality but call this
<literal>User space</literal>. MySQL Server doesn't
support tablespaces such as used in statements like
- this: <literal>CREATE TABLE ralph.my_table...IN
+ this: <literal>CREATE TABLE ralph.my_table ... IN
my_tablespace</literal>.
</para>
</listitem>
@@ -1239,7 +1239,7 @@
<listitem>
<para>
- <literal>INSERT INTO ... SET
+ <literal>INSERT INTO <literal>tbl_name</literal> SET
<replaceable>col_name</replaceable> = ...</literal>
syntax.
</para>
@@ -1385,13 +1385,14 @@
<listitem>
<para>
String comparisons are case-insensitive by default, with
- sort ordering determined by the current character set,
- which is <literal>latin1</literal> (cp1252 West
- European) by default. If you don't like this, you should
- declare your columns with the <literal>BINARY</literal>
- attribute or use the <literal>BINARY</literal> cast,
- which causes comparisons to be done using the underlying
- character code values rather then a lexical ordering.
+ sort ordering determined by collation of the current
+ character set, which is <literal>latin1</literal>
+ (cp1252 West European) by default. If you don't like
+ this, you should declare your columns with the
+ <literal>BINARY</literal> attribute or use the
+ <literal>BINARY</literal> cast, which causes comparisons
+ to be done using the underlying character code values
+ rather then a lexical ordering.
</para>
</listitem>
@@ -2139,7 +2140,7 @@
<literal>INSERT</literal> and <literal>SELECT</literal>
operations. In this case, the table has no holes in the middle
and the inserts can be performed concurrently with retrievals.
- See <xref linkend="table-locking"/>.)
+ See <xref linkend="concurrent-inserts"/>.)
</para>
<para>
@@ -2225,7 +2226,7 @@
</para>
<programlisting>
-SELECT * FROM t1, t2 WHERE t1.id = t2.id;
+SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id;
</programlisting>
<para>
@@ -2592,7 +2593,7 @@
If you try to store an out of range value into a numeric
column, MySQL Server instead stores zero, the smallest
possible value, or the largest possible value, whichever
- is closest to the invalid value. column.
+ is closest to the invalid value.
</para>
</listitem>
Modified: trunk/refman-common/maxdb.en.xml
===================================================================
--- trunk/refman-common/maxdb.en.xml 2006-03-21 21:04:44 UTC (rev 1641)
+++ trunk/refman-common/maxdb.en.xml 2006-03-22 17:24:40 UTC (rev 1642)
@@ -369,7 +369,7 @@
recommend to hand-tune the definition files. The
<command>mysqldump</command> tool offers an option
<option>--compatible=maxdb</option> to produce output that is
- compatible to MaxDB to make porting easier.
+ compatible with MaxDB to make porting easier.
</para>
<para>
Modified: trunk/refman-common/what-is.en.xml
===================================================================
--- trunk/refman-common/what-is.en.xml 2006-03-21 21:04:44 UTC (rev 1641)
+++ trunk/refman-common/what-is.en.xml 2006-03-22 17:24:40 UTC (rev 1642)
@@ -49,7 +49,7 @@
a database management system such as MySQL Server. Since
computers are very good at handling large amounts of data,
database management systems play a central role in computing, as
- standalone utilities or as parts of other applications.
+ standalone utilities, or as parts of other applications.
</para>
</listitem>
@@ -577,7 +577,7 @@
<listitem>
<para>
- In MySQL versions 4.1 and higher, Windows servers also support
+ In MySQL 4.1 and higher, Windows servers also support
shared-memory connections if started with the
<option>--shared-memory</option> option. Clients can connect
through shared memory by using the
@@ -924,11 +924,11 @@
than 2GB in size by using the Large File Support (LFS) patch for
the ext2 filesystem. On Linux 2.4, patches also exist for ReiserFS
to get support for big files (up to 2TB). Most current Linux
- distributions are based on kernel 2.4 and include all the required
- LFS patches. With JFS and XFS, petabyte and larger files are
- possible on Linux. However, the maximum available file size still
- depends on several factors, one of them being the filesystem used
- to store MySQL tables.
+ distributions are based on kernel 2.4 or higher and include all
+ the required LFS patches. With JFS and XFS, petabyte and larger
+ files are possible on Linux. However, the maximum available file
+ size still depends on several factors, one of them being the
+ filesystem used to store MySQL tables.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1642 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 22 Mar |
