Author: paul
Date: 2006-01-05 21:44:31 +0100 (Thu, 05 Jan 2006)
New Revision: 691
Log:
r5876@frost: paul | 2006-01-05 13:36:21 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/introduction.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.1/introduction.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5875
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1933
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5876
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1933
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2006-01-05 20:43:33 UTC (rev 690)
+++ trunk/refman-4.1/introduction.xml 2006-01-05 20:44:31 UTC (rev 691)
@@ -2400,13 +2400,12 @@
</indexterm>
<para>
- Stored procedures are implemented in MySQL version 5.0.
+ Stored procedures and functions are implemented beginning with MySQL 5.0.
</para>
<para>
- Basic triggers functionality is implemented in MySQL beginning
- with version 5.0.2, with further development planned in MySQL
- 5.1.
+ Basic trigger functionality is implemented beginning with MySQL
+ 5.0.2, with further development planned for MySQL 5.1.
</para>
</section>
@@ -2491,7 +2490,7 @@
necessary checks. Additional checking by the server affects
performance, which for some applications may be sufficiently
undesirable as to be avoided if possible. (Some major
- commercial applications have coded the foreign-key logic at
+ commercial applications have coded the foreign key logic at
the application level for this reason.)
</para>
@@ -2499,12 +2498,12 @@
MySQL gives database developers the choice of which approach
to use. If you don't need foreign keys and want to avoid the
overhead associated with enforcing referential integrity, you
- can choose another table type instead, such as
+ can choose another storage engine instead, such as
<literal>MyISAM</literal>. (For example, the
<literal>MyISAM</literal> storage engine offers very fast
performance for applications that perform only
<literal>INSERT</literal> and <literal>SELECT</literal>
- operations, because the inserts can be performed concurrently
+ 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"/>.)
</para>
@@ -2530,8 +2529,8 @@
<listitem>
<para>
If <literal>ON DELETE</literal> is the only referential
- integrity capability an application needs, note that as of
- MySQL Server 4.0, you can use multiple-table
+ integrity capability an application needs, you can achieve a similar effect as of
+ MySQL Server 4.0 by using multiple-table
<literal>DELETE</literal> statements to delete rows from
many tables with a single statement. See
<xref linkend="delete"/>.
@@ -2542,16 +2541,16 @@
<para>
A workaround for the lack of <literal>ON DELETE</literal>
is to add the appropriate <literal>DELETE</literal>
- statement to your application when you delete records from
+ statements to your application when you delete records from
a table that has a foreign key. In practice, this is often
- as quick as using foreign keys, and is more portable.
+ as quick as using foreign keys and is more portable.
</para>
</listitem>
</itemizedlist>
<para>
- Be aware that the use of foreign keys can in some instances
+ Be aware that the use of foreign keys can sometimes
lead to problems:
</para>
@@ -2577,7 +2576,7 @@
<xref linkend="innodb-foreign-key-constraints"/>. As of
MySQL 4.1.1, <command>mysqldump</command> generates dump
files that take advantage of this capability automatically
- when reloaded.)
+ when they are reloaded.)
</para>
</listitem>
@@ -2595,7 +2594,7 @@
</programlisting>
<para>
- See <xref linkend="join"/>. See
+ See <xref linkend="join"/>, and
<xref linkend="example-foreign-keys"/>.
</para>
@@ -2621,9 +2620,8 @@
</indexterm>
<para>
- Views (including updatable views) are implemented in the 5.0
- version of MySQL Server. Views are available in binary
- releases from 5.0.1 and up.
+ Views (including updatable views) are implemented beginning with
+ MySQL Server 5.0.1.
</para>
<para>
@@ -2671,12 +2669,14 @@
</para>
<para>
- MySQL Server 3.23.3 and above support the
- ‘<literal>--</literal>’ comment style, provided
- the comment is followed by a space (or by a control character
- such as a newline). The requirement for a space is to prevent
- problems with automatically generated SQL queries that have
- used something like the following code, where we automatically
+ MySQL Server 3.23.3 and up supports a variant of the
+ ‘<literal>--</literal>’ comment style. That is,
+the
+ ‘<literal>--</literal>’ start-comment sequence must be
+ followed by a space (or by a control character
+ such as a newline). The space is required to prevent
+ problems with automatically generated SQL queries that use constructs such as the following,
+ where we automatically
insert the value of the payment for
<literal>!payment!</literal>:
</para>
@@ -2686,8 +2686,8 @@
</programlisting>
<para>
- Think about what happens if the value of
- <literal>payment</literal> is a negative value such as
+ Consider about what happens if
+ <literal>payment</literal> has a negative value such as
<literal>-1</literal>:
</para>
@@ -2697,7 +2697,8 @@
<para>
<literal>credit--1</literal> is a legal expression in SQL, but
- if <literal>--</literal> is interpreted as the start of a
+ ‘<literal>--</literal>’
+ is interpreted as the start of a
comment, part of the expression is discarded. The result is a
statement that has a completely different meaning than
intended:
@@ -2715,14 +2716,17 @@
</para>
<para>
- Using our implementation of this method of commenting in MySQL
+ Using our implementation of require a following space for
+ ‘<literal>--</literal>’
+to be recognized as a start-comment sequence
+in MySQL
Server 3.23.3 and up, <literal>credit--1</literal> is actually
safe.
</para>
<para>
Another safe feature is that the <command>mysql</command>
- command-line client removes all lines that start with
+ command-line client ignores lines that start with
‘<literal>--</literal>’.
</para>
@@ -2732,11 +2736,11 @@
</para>
<para>
- If you have an SQL program in a text file that contains
+ If you have an SQL script in a text file that contains
‘<literal>--</literal>’ comments, you should use
the <command>replace</command> utility as follows to convert
the comments to use ‘<literal>#</literal>’
- characters:
+ characters before executing the script:
</para>
<programlisting>
@@ -2745,7 +2749,7 @@
</programlisting>
<para>
- instead of the usual:
+That is safer than executing the script in the usual way:
</para>
<programlisting>
@@ -2753,7 +2757,7 @@
</programlisting>
<para>
- You can also edit the command file <quote>in place</quote> to
+ You can also edit the script file <quote>in place</quote> to
change the ‘<literal>--</literal>’ comments to
‘<literal>#</literal>’ comments:
</para>
@@ -2770,6 +2774,11 @@
shell> <userinput>replace " #" " --" -- text-file-with-funny-comments.sql</userinput>
</programlisting>
+
+<para>
+See <xref linkend="replace-utility"/>.
+</para>
+
</section>
</section>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2006-01-05 20:43:33 UTC (rev 690)
+++ trunk/refman-5.0/introduction.xml 2006-01-05 20:44:31 UTC (rev 691)
@@ -2033,13 +2033,13 @@
</indexterm>
<para>
- Stored procedures are implemented in MySQL version 5.0. See
+ Stored procedures and functions are implemented beginning with MySQL 5.0. See
<xref linkend="stored-procedures"/>.
</para>
<para>
- Basic triggers functionality is implemented in MySQL beginning
- with version 5.0.2, with further development planned in MySQL
+ Basic trigger functionality is implemented beginning with MySQL
+ 5.0.2, with further development planned for MySQL
5.1. See <xref linkend="triggers"/>.
</para>
@@ -2125,7 +2125,7 @@
necessary checks. Additional checking by the server affects
performance, which for some applications may be sufficiently
undesirable as to be avoided if possible. (Some major
- commercial applications have coded the foreign-key logic at
+ commercial applications have coded the foreign key logic at
the application level for this reason.)
</para>
@@ -2133,12 +2133,12 @@
MySQL gives database developers the choice of which approach
to use. If you don't need foreign keys and want to avoid the
overhead associated with enforcing referential integrity, you
- can choose another table type instead, such as
+ can choose another storage engine instead, such as
<literal>MyISAM</literal>. (For example, the
<literal>MyISAM</literal> storage engine offers very fast
performance for applications that perform only
<literal>INSERT</literal> and <literal>SELECT</literal>
- operations, because the inserts can be performed concurrently
+ 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"/>.)
</para>
@@ -2164,8 +2164,8 @@
<listitem>
<para>
If <literal>ON DELETE</literal> is the only referential
- integrity capability an application needs, note that as of
- MySQL Server 4.0, you can use multiple-table
+ integrity capability an application needs, you can achieve a similar effect as of
+ MySQL Server 4.0 by using multiple-table
<literal>DELETE</literal> statements to delete rows from
many tables with a single statement. See
<xref linkend="delete"/>.
@@ -2176,16 +2176,16 @@
<para>
A workaround for the lack of <literal>ON DELETE</literal>
is to add the appropriate <literal>DELETE</literal>
- statement to your application when you delete records from
+ statements to your application when you delete records from
a table that has a foreign key. In practice, this is often
- as quick as using foreign keys, and is more portable.
+ as quick as using foreign keys and is more portable.
</para>
</listitem>
</itemizedlist>
<para>
- Be aware that the use of foreign keys can in some instances
+ Be aware that the use of foreign keys can sometimes
lead to problems:
</para>
@@ -2211,7 +2211,7 @@
<xref linkend="innodb-foreign-key-constraints"/>. As of
MySQL 4.1.1, <command>mysqldump</command> generates dump
files that take advantage of this capability automatically
- when reloaded.)
+ when they are reloaded.)
</para>
</listitem>
@@ -2229,7 +2229,7 @@
</programlisting>
<para>
- See <xref linkend="join"/>. See
+ See <xref linkend="join"/>, and
<xref linkend="example-foreign-keys"/>.
</para>
@@ -2255,9 +2255,8 @@
</indexterm>
<para>
- Views (including updatable views) are implemented in the 5.0
- version of MySQL Server. Views are available in binary
- releases from 5.0.1 and up. See <xref linkend="views"/>.
+ Views (including updatable views) are implemented beginning with
+ MySQL Server 5.0.1. See <xref linkend="views"/>.
</para>
<para>
@@ -2305,12 +2304,14 @@
</para>
<para>
- MySQL Server 3.23.3 and above support the
- ‘<literal>--</literal>’ comment style, provided
- the comment is followed by a space (or by a control character
- such as a newline). The requirement for a space is to prevent
- problems with automatically generated SQL queries that have
- used something like the following code, where we automatically
+ MySQL Server 3.23.3 and up supports a variant of the
+ ‘<literal>--</literal>’ comment style. That is,
+the
+ ‘<literal>--</literal>’ start-comment sequence must be
+ followed by a space (or by a control character
+ such as a newline). The space is required to prevent
+ problems with automatically generated SQL queries that use constructs such as the following,
+ where we automatically
insert the value of the payment for
<literal>!payment!</literal>:
</para>
@@ -2320,8 +2321,8 @@
</programlisting>
<para>
- Think about what happens if the value of
- <literal>payment</literal> is a negative value such as
+ Consider about what happens if
+ <literal>payment</literal> has a negative value such as
<literal>-1</literal>:
</para>
@@ -2331,7 +2332,8 @@
<para>
<literal>credit--1</literal> is a legal expression in SQL, but
- if <literal>--</literal> is interpreted as the start of a
+ ‘<literal>--</literal>’
+ is interpreted as the start of a
comment, part of the expression is discarded. The result is a
statement that has a completely different meaning than
intended:
@@ -2349,14 +2351,17 @@
</para>
<para>
- Using our implementation of this method of commenting in MySQL
+ Using our implementation of require a following space for
+ ‘<literal>--</literal>’
+to be recognized as a start-comment sequence
+in MySQL
Server 3.23.3 and up, <literal>credit--1</literal> is actually
safe.
</para>
<para>
Another safe feature is that the <command>mysql</command>
- command-line client removes all lines that start with
+ command-line client ignores lines that start with
‘<literal>--</literal>’.
</para>
@@ -2366,11 +2371,11 @@
</para>
<para>
- If you have an SQL program in a text file that contains
+ If you have an SQL script in a text file that contains
‘<literal>--</literal>’ comments, you should use
the <command>replace</command> utility as follows to convert
the comments to use ‘<literal>#</literal>’
- characters:
+ characters before executing the script:
</para>
<programlisting>
@@ -2379,7 +2384,7 @@
</programlisting>
<para>
- instead of the usual:
+That is safer than executing the script in the usual way:
</para>
<programlisting>
@@ -2387,7 +2392,7 @@
</programlisting>
<para>
- You can also edit the command file <quote>in place</quote> to
+ You can also edit the script file <quote>in place</quote> to
change the ‘<literal>--</literal>’ comments to
‘<literal>#</literal>’ comments:
</para>
@@ -2404,6 +2409,11 @@
shell> <userinput>replace " #" " --" -- text-file-with-funny-comments.sql</userinput>
</programlisting>
+
+<para>
+See <xref linkend="replace-utility"/>.
+</para>
+
</section>
</section>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2006-01-05 20:43:33 UTC (rev 690)
+++ trunk/refman-5.1/introduction.xml 2006-01-05 20:44:31 UTC (rev 691)
@@ -1792,13 +1792,13 @@
</indexterm>
<para>
- Stored procedures are implemented in MySQL version 5.0. See
+ Stored procedures and functions are implemented beginning with MySQL 5.0. See
<xref linkend="stored-procedures"/>.
</para>
<para>
- Basic triggers functionality is implemented in MySQL beginning
- with version 5.0.2, with further development planned in MySQL
+ Basic trigger functionality is implemented beginning with MySQL
+ 5.0.2, with further development planned for MySQL
5.1. See <xref linkend="triggers"/>.
</para>
@@ -1884,7 +1884,7 @@
necessary checks. Additional checking by the server affects
performance, which for some applications may be sufficiently
undesirable as to be avoided if possible. (Some major
- commercial applications have coded the foreign-key logic at
+ commercial applications have coded the foreign key logic at
the application level for this reason.)
</para>
@@ -1892,12 +1892,12 @@
MySQL gives database developers the choice of which approach
to use. If you don't need foreign keys and want to avoid the
overhead associated with enforcing referential integrity, you
- can choose another table type instead, such as
+ can choose another storage engine instead, such as
<literal>MyISAM</literal>. (For example, the
<literal>MyISAM</literal> storage engine offers very fast
performance for applications that perform only
<literal>INSERT</literal> and <literal>SELECT</literal>
- operations, because the inserts can be performed concurrently
+ 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"/>.)
</para>
@@ -1923,8 +1923,8 @@
<listitem>
<para>
If <literal>ON DELETE</literal> is the only referential
- integrity capability an application needs, note that as of
- MySQL Server 4.0, you can use multiple-table
+ integrity capability an application needs, you can achieve a similar effect as of
+ MySQL Server 4.0 by using multiple-table
<literal>DELETE</literal> statements to delete rows from
many tables with a single statement. See
<xref linkend="delete"/>.
@@ -1935,16 +1935,16 @@
<para>
A workaround for the lack of <literal>ON DELETE</literal>
is to add the appropriate <literal>DELETE</literal>
- statement to your application when you delete records from
+ statements to your application when you delete records from
a table that has a foreign key. In practice, this is often
- as quick as using foreign keys, and is more portable.
+ as quick as using foreign keys and is more portable.
</para>
</listitem>
</itemizedlist>
<para>
- Be aware that the use of foreign keys can in some instances
+ Be aware that the use of foreign keys can sometimes
lead to problems:
</para>
@@ -1970,7 +1970,7 @@
<xref linkend="innodb-foreign-key-constraints"/>. As of
MySQL 4.1.1, <command>mysqldump</command> generates dump
files that take advantage of this capability automatically
- when reloaded.)
+ when they are reloaded.)
</para>
</listitem>
@@ -1988,7 +1988,7 @@
</programlisting>
<para>
- See <xref linkend="join"/>. See
+ See <xref linkend="join"/>, and
<xref linkend="example-foreign-keys"/>.
</para>
@@ -2014,9 +2014,8 @@
</indexterm>
<para>
- Views (including updatable views) are implemented in the 5.0
- version of MySQL Server. Views are available in binary
- releases from 5.0.1 and up. See <xref linkend="views"/>.
+ Views (including updatable views) are implemented beginning with
+ MySQL Server 5.0.1. See <xref linkend="views"/>.
</para>
<para>
@@ -2064,12 +2063,14 @@
</para>
<para>
- MySQL Server 3.23.3 and above support the
- ‘<literal>--</literal>’ comment style, provided
- the comment is followed by a space (or by a control character
- such as a newline). The requirement for a space is to prevent
- problems with automatically generated SQL queries that have
- used something like the following code, where we automatically
+ MySQL Server 3.23.3 and up supports a variant of the
+ ‘<literal>--</literal>’ comment style. That is,
+the
+ ‘<literal>--</literal>’ start-comment sequence must be
+ followed by a space (or by a control character
+ such as a newline). The space is required to prevent
+ problems with automatically generated SQL queries that use constructs such as the following,
+ where we automatically
insert the value of the payment for
<literal>!payment!</literal>:
</para>
@@ -2079,8 +2080,8 @@
</programlisting>
<para>
- Think about what happens if the value of
- <literal>payment</literal> is a negative value such as
+ Consider about what happens if
+ <literal>payment</literal> has a negative value such as
<literal>-1</literal>:
</para>
@@ -2090,7 +2091,8 @@
<para>
<literal>credit--1</literal> is a legal expression in SQL, but
- if <literal>--</literal> is interpreted as the start of a
+ ‘<literal>--</literal>’
+ is interpreted as the start of a
comment, part of the expression is discarded. The result is a
statement that has a completely different meaning than
intended:
@@ -2108,14 +2110,17 @@
</para>
<para>
- Using our implementation of this method of commenting in MySQL
+ Using our implementation of require a following space for
+ ‘<literal>--</literal>’
+to be recognized as a start-comment sequence
+in MySQL
Server 3.23.3 and up, <literal>credit--1</literal> is actually
safe.
</para>
<para>
Another safe feature is that the <command>mysql</command>
- command-line client removes all lines that start with
+ command-line client ignores lines that start with
‘<literal>--</literal>’.
</para>
@@ -2125,11 +2130,11 @@
</para>
<para>
- If you have an SQL program in a text file that contains
+ If you have an SQL script in a text file that contains
‘<literal>--</literal>’ comments, you should use
the <command>replace</command> utility as follows to convert
the comments to use ‘<literal>#</literal>’
- characters:
+ characters before executing the script:
</para>
<programlisting>
@@ -2138,7 +2143,7 @@
</programlisting>
<para>
- instead of the usual:
+That is safer than executing the script in the usual way:
</para>
<programlisting>
@@ -2146,7 +2151,7 @@
</programlisting>
<para>
- You can also edit the command file <quote>in place</quote> to
+ You can also edit the script file <quote>in place</quote> to
change the ‘<literal>--</literal>’ comments to
‘<literal>#</literal>’ comments:
</para>
@@ -2163,6 +2168,11 @@
shell> <userinput>replace " #" " --" -- text-file-with-funny-comments.sql</userinput>
</programlisting>
+
+<para>
+See <xref linkend="replace-utility"/>.
+</para>
+
</section>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r691 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 5 Jan |
