Author: paul
Date: 2006-01-25 20:11:24 +0100 (Wed, 25 Jan 2006)
New Revision: 1033
Log:
r2521@kite-hub: paul | 2006-01-25 13:11:16 -0600
Retarget <xref> elements per previous commit.
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/functions.xml
trunk/refman-4.1/introduction.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-4.1/storage-engines.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/storage-engines.xml
trunk/refman-5.0/triggers.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/functions.xml
trunk/refman-5.1/introduction.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.1/storage-engines.xml
trunk/refman-5.1/triggers.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6663
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2518
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6663
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2521
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-4.1/database-administration.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -2773,6 +2773,10 @@
<option>--skip-new</option>. This variable was added in
MySQL 3.23.7.
</para>
+
+ <para>
+ See also <xref linkend="concurrent-inserts"/>.
+ </para>
</listitem>
<listitem>
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-4.1/functions.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -13840,9 +13840,9 @@
inserted, had no duplicate-key conflict occurred. This
function is especially useful in multiple-row inserts. The
<literal>VALUES()</literal> function is meaningful only in
- <literal>INSERT … UPDATE</literal> statements and
- returns <literal>NULL</literal> otherwise.
- <xref linkend="insert"/>.
+ <literal>INSERT … ON DUPLICATE KEY UPDATE</literal>
+ statements and returns <literal>NULL</literal> otherwise.
+ <xref linkend="insert-on-duplicate"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-4.1/introduction.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -2183,6 +2183,7 @@
DELAYED</literal>, you can write inserts that go into a local
queue until the locks are released, without having the client
wait for the insert to complete. See
+ <xref linkend="concurrent-inserts"/>, and
<xref linkend="insert-delayed"/>.
</para>
@@ -2985,7 +2986,7 @@
the empty string (<literal>''</literal>) for string types,
and the <quote>zero</quote> value for date and time types.
Implicit default values are discussed in
- <xref linkend="create-table"/>.
+ <xref linkend="data-type-defaults"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-4.1/sql-syntax.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -414,7 +414,7 @@
<literal>NULL</literal>, the new default is
<literal>NULL</literal>. If the column cannot be
<literal>NULL</literal>, MySQL assigns a default value, as
- described in <xref linkend="create-table"/>.
+ described in <xref linkend="data-type-defaults"/>.
</para>
</listitem>
@@ -3990,7 +3990,7 @@
<literal>LOW_PRIORITY</literal> should normally not be used
with <literal>MyISAM</literal> tables because doing so
disables concurrent inserts. See
- <xref linkend="myisam-storage-engine"/>.
+ <xref linkend="concurrent-inserts"/>.
<literal>LOW_PRIORITY</literal> was added in MySQL 3.22.5.
</para>
</listitem>
Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-4.1/storage-engines.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -625,7 +625,7 @@
result of deleting rows or an update of a dynamic length row
with more data than its current contents. When all free blocks
are used up (filled in), future inserts become concurrent
- again.
+ again. See <xref linkend="concurrent-inserts"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.0/database-administration.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -3007,7 +3007,7 @@
</para>
<para>
- In MySQL 5.0.6 this variable was changed to an integer
+ In MySQL 5.0.6, this variable was changed to an integer
that takes 3 values:
</para>
@@ -3040,6 +3040,10 @@
</tbody>
</tgroup>
</informaltable>
+
+ <para>
+ See also <xref linkend="concurrent-inserts"/>.
+ </para>
</listitem>
<listitem>
@@ -8644,7 +8648,7 @@
data type. In either case, MySQL generates a warning
rather than an error and continues processing the
statement. Implicit defaults are described in
- <xref linkend="create-table"/>.
+ <xref linkend="data-type-defaults"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.0/functions.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -1053,12 +1053,11 @@
</para>
<para>
- To comply with the SQL standard,
- <literal>IN</literal> returns <literal>NULL</literal> not
- only if the expression on the left hand side is
- <literal>NULL</literal>, but also if no match is found in
- the list and one of the expressions in the list is
- <literal>NULL</literal>.
+ To comply with the SQL standard, <literal>IN</literal>
+ returns <literal>NULL</literal> not only if the expression
+ on the left hand side is <literal>NULL</literal>, but also
+ if no match is found in the list and one of the expressions
+ in the list is <literal>NULL</literal>.
</para>
<para>
@@ -13914,9 +13913,9 @@
inserted, had no duplicate-key conflict occurred. This
function is especially useful in multiple-row inserts. The
<literal>VALUES()</literal> function is meaningful only in
- <literal>INSERT … UPDATE</literal> statements and
- returns <literal>NULL</literal> otherwise.
- <xref linkend="insert"/>.
+ <literal>INSERT … ON DUPLICATE KEY UPDATE</literal>
+ statements and returns <literal>NULL</literal> otherwise.
+ <xref linkend="insert-on-duplicate"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.0/introduction.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -1807,6 +1807,7 @@
DELAYED</literal>, you can write inserts that go into a local
queue until the locks are released, without having the client
wait for the insert to complete. See
+ <xref linkend="concurrent-inserts"/>, and
<xref linkend="insert-delayed"/>.
</para>
@@ -2645,7 +2646,7 @@
the empty string (<literal>''</literal>) for string types,
and the <quote>zero</quote> value for date and time types.
Implicit default values are discussed in
- <xref linkend="create-table"/>.
+ <xref linkend="data-type-defaults"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -455,7 +455,7 @@
<literal>NULL</literal>, the new default is
<literal>NULL</literal>. If the column cannot be
<literal>NULL</literal>, MySQL assigns a default value, as
- described in <xref linkend="create-table"/>.
+ described in <xref linkend="data-type-defaults"/>.
</para>
</listitem>
@@ -3952,7 +3952,7 @@
<literal>LOW_PRIORITY</literal> should normally not be used
with <literal>MyISAM</literal> tables because doing so
disables concurrent inserts. See
- <xref linkend="myisam-storage-engine"/>.
+ <xref linkend="concurrent-inserts"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.0/storage-engines.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -633,7 +633,7 @@
result of deleting rows or an update of a dynamic length row
with more data than its current contents. When all free blocks
are used up (filled in), future inserts become concurrent
- again.
+ again. See <xref linkend="concurrent-inserts"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/triggers.xml
===================================================================
--- trunk/refman-5.0/triggers.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.0/triggers.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -160,7 +160,7 @@
<para>
A potentially confusing example of this is the <literal>INSERT
- INTO .. ON DUPLICATE UPDATE …</literal> syntax: a
+ INTO ... ON DUPLICATE UPDATE ...</literal> syntax: a
<literal>BEFORE INSERT</literal> trigger will activate for every
row, followed by either an <literal>AFTER INSERT</literal> trigger
or both the <literal>BEFORE UPDATE</literal> and <literal>AFTER
@@ -180,7 +180,7 @@
<para>
<replaceable>trigger_stmt</replaceable> is the statement to
execute when the trigger activates. If you want to execute
- multiple statements, use the <literal>BEGIN … END</literal>
+ multiple statements, use the <literal>BEGIN ... END</literal>
compound statement construct. This also enables you to use the
same statements that are allowable within stored routines. See
<xref linkend="begin-end"/>.
@@ -680,9 +680,9 @@
triggers or two <literal>AFTER UPDATE</literal> triggers for a
table. This should rarely be a significant limitation, because it
is possible to define a trigger that executes multiple statements
- by using the <literal>BEGIN … END</literal> compound
- statement construct after <literal>FOR EACH ROW</literal>. (An
- example appears later in this section.)
+ by using the <literal>BEGIN ... END</literal> compound statement
+ construct after <literal>FOR EACH ROW</literal>. (An example
+ appears later in this section.)
</para>
<para>
@@ -727,8 +727,8 @@
</para>
<para>
- By using the <literal>BEGIN … END</literal> construct, you
- can define a trigger that executes multiple statements. Within the
+ By using the <literal>BEGIN ... END</literal> construct, you can
+ define a trigger that executes multiple statements. Within the
<literal>BEGIN</literal> block, you also can use other syntax that
is allowed within stored routines such as conditionals and loops.
However, just as for stored routines, if you use the
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.1/database-administration.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -3070,6 +3070,10 @@
</tbody>
</tgroup>
</informaltable>
+
+ <para>
+ See also <xref linkend="concurrent-inserts"/>.
+ </para>
</listitem>
<listitem>
@@ -8701,7 +8705,7 @@
data type. In either case, MySQL generates a warning
rather than an error and continues processing the
statement. Implicit defaults are described in
- <xref linkend="create-table"/>.
+ <xref linkend="data-type-defaults"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.1/functions.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -1044,12 +1044,11 @@
</para>
<para>
- To comply with the SQL standard,
- <literal>IN</literal> returns <literal>NULL</literal> not
- only if the expression on the left hand side is
- <literal>NULL</literal>, but also if no match is found in
- the list and one of the expressions in the list is
- <literal>NULL</literal>.
+ To comply with the SQL standard, <literal>IN</literal>
+ returns <literal>NULL</literal> not only if the expression
+ on the left hand side is <literal>NULL</literal>, but also
+ if no match is found in the list and one of the expressions
+ in the list is <literal>NULL</literal>.
</para>
<para>
@@ -14301,9 +14300,9 @@
inserted, had no duplicate-key conflict occurred. This
function is especially useful in multiple-row inserts. The
<literal>VALUES()</literal> function is meaningful only in
- <literal>INSERT … UPDATE</literal> statements and
- returns <literal>NULL</literal> otherwise.
- <xref linkend="insert"/>.
+ <literal>INSERT … ON DUPLICATE KEY UPDATE</literal>
+ statements and returns <literal>NULL</literal> otherwise.
+ <xref linkend="insert-on-duplicate"/>.
</para>
<remark role="help-description-end"/>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.1/introduction.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -1566,6 +1566,7 @@
DELAYED</literal>, you can write inserts that go into a local
queue until the locks are released, without having the client
wait for the insert to complete. See
+ <xref linkend="concurrent-inserts"/>, and
<xref linkend="insert-delayed"/>.
</para>
@@ -2404,7 +2405,7 @@
the empty string (<literal>''</literal>) for string types,
and the <quote>zero</quote> value for date and time types.
Implicit default values are discussed in
- <xref linkend="create-table"/>.
+ <xref linkend="data-type-defaults"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -453,7 +453,7 @@
<literal>NULL</literal>, the new default is
<literal>NULL</literal>. If the column cannot be
<literal>NULL</literal>, MySQL assigns a default value, as
- described in <xref linkend="create-table"/>.
+ described in <xref linkend="data-type-defaults"/>.
</para>
</listitem>
@@ -4550,7 +4550,7 @@
<literal>LOW_PRIORITY</literal> should normally not be used
with <literal>MyISAM</literal> tables because doing so
disables concurrent inserts. See
- <xref linkend="myisam-storage-engine"/>.
+ <xref linkend="concurrent-inserts"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.1/storage-engines.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -628,7 +628,7 @@
result of deleting rows or an update of a dynamic length row
with more data than its current contents. When all free blocks
are used up (filled in), future inserts become concurrent
- again.
+ again. See <xref linkend="concurrent-inserts"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/triggers.xml
===================================================================
--- trunk/refman-5.1/triggers.xml 2006-01-25 19:10:01 UTC (rev 1032)
+++ trunk/refman-5.1/triggers.xml 2006-01-25 19:11:24 UTC (rev 1033)
@@ -158,7 +158,7 @@
<para>
A potentially confusing example of this is the <literal>INSERT
- INTO .. ON DUPLICATE UPDATE …</literal> syntax: a
+ INTO ... ON DUPLICATE UPDATE ...</literal> syntax: a
<literal>BEFORE INSERT</literal> trigger will activate for every
row, followed by either an <literal>AFTER INSERT</literal> trigger
or both the <literal>BEFORE UPDATE</literal> and <literal>AFTER
@@ -178,7 +178,7 @@
<para>
<replaceable>trigger_stmt</replaceable> is the statement to
execute when the trigger activates. If you want to execute
- multiple statements, use the <literal>BEGIN … END</literal>
+ multiple statements, use the <literal>BEGIN ... END</literal>
compound statement construct. This also enables you to use the
same statements that are allowable within stored routines. See
<xref linkend="begin-end"/>.
@@ -640,9 +640,9 @@
triggers or two <literal>AFTER UPDATE</literal> triggers for a
table. This should rarely be a significant limitation, because it
is possible to define a trigger that executes multiple statements
- by using the <literal>BEGIN … END</literal> compound
- statement construct after <literal>FOR EACH ROW</literal>. (An
- example appears later in this section.)
+ by using the <literal>BEGIN ... END</literal> compound statement
+ construct after <literal>FOR EACH ROW</literal>. (An example
+ appears later in this section.)
</para>
<para>
@@ -687,8 +687,8 @@
</para>
<para>
- By using the <literal>BEGIN … END</literal> construct, you
- can define a trigger that executes multiple statements. Within the
+ By using the <literal>BEGIN ... END</literal> construct, you can
+ define a trigger that executes multiple statements. Within the
<literal>BEGIN</literal> block, you also can use other syntax that
is allowed within stored routines such as conditionals and loops.
However, just as for stored routines, if you use the
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1033 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 25 Jan |
