Author: paul
Date: 2010-11-12 03:11:40 +0100 (Fri, 12 Nov 2010)
New Revision: 23706
Log:
r65433@frost: paul | 2010-11-11 20:06:48 -0500
Remove unnecessary autolink attribute
Modified:
trunk/dynamic-docs/changelog/mysqld-2.xml
trunk/refman-5.5/sql-syntax-data-manipulation.xml
trunk/refman-5.6/sql-syntax-data-manipulation.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44109
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65432
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44109
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65433
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/dynamic-docs/changelog/mysqld-2.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-2.xml 2010-11-12 02:11:32 UTC (rev 23705)
+++ trunk/dynamic-docs/changelog/mysqld-2.xml 2010-11-12 02:11:40 UTC (rev 23706)
Changed blocks: 1, Lines Added: 21, Lines Deleted: 27; 3985 bytes
@@ -1538,57 +1538,51 @@
<message>
<para>
- The behavior of
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal> statements when using statement-based
- replication has changed as follows:
+ The behavior of <literal role="stmt">INSERT DELAYED</literal>
+ statements when using statement-based replication has changed as
+ follows:
</para>
<para>
Previously, when using
<literal role="sysvar">binlog_format=STATEMENT</literal>, a
warning was issued in the client when executing
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal>; now, no warning is issued in such cases.
+ <literal role="stmt">INSERT DELAYED</literal>; now, no warning
+ is issued in such cases.
</para>
<para>
Previously, when using
<literal role="sysvar">binlog_format=STATEMENT</literal>,
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal> was logged as
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal>; now, it is logged as an
- <literal role="stmt">INSERT</literal>, without the
+ <literal role="stmt">INSERT DELAYED</literal> was logged as
+ <literal role="stmt">INSERT DELAYED</literal>; now, it is logged
+ as an <literal role="stmt">INSERT</literal>, without the
<literal>DELAYED</literal> option.
</para>
<para>
However, when
<literal role="sysvar">binlog_format=STATEMENT</literal>,
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal> continues to be executed as
- <literal role="stmt">INSERT</literal> (without the
+ <literal role="stmt">INSERT DELAYED</literal> continues to be
+ executed as <literal role="stmt">INSERT</literal> (without the
<literal>DELAYED</literal> option). The behavior of
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal> remains unchanged when using
- <literal role="sysvar">binlog_format=ROW</literal>:
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal> generates no warnings, is executed as
- <literal role="stmt" condition="insert-delayed">INSERT
+ <literal role="stmt">INSERT DELAYED</literal> remains unchanged
+ when using <literal role="sysvar">binlog_format=ROW</literal>:
+ <literal role="stmt">INSERT DELAYED</literal> generates no
+ warnings, is executed as <literal role="stmt">INSERT
DELAYED</literal>, and is logged using the row-based format.
</para>
<para>
This change also affects
<literal role="sysvar">binlog_format=MIXED</literal>, because
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal> is no longer considered unsafe. Now, when the
- logging format is <literal>MIXED</literal>, no switch to
- row-based logging occurs. This means that the statement is
- logged as a simple <literal role="stmt">INSERT</literal> (that
- is, without the <literal>DELAYED</literal> option), using the
- statement-based logging format.
+ <literal role="stmt">INSERT DELAYED</literal> is no longer
+ considered unsafe. Now, when the logging format is
+ <literal>MIXED</literal>, no switch to row-based logging occurs.
+ This means that the statement is logged as a simple
+ <literal role="stmt">INSERT</literal> (that is, without the
+ <literal>DELAYED</literal> option), using the statement-based
+ logging format.
</para>
</message>
Modified: trunk/refman-5.5/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-data-manipulation.xml 2010-11-12 02:11:32 UTC (rev 23705)
+++ trunk/refman-5.5/sql-syntax-data-manipulation.xml 2010-11-12 02:11:40 UTC (rev 23706)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 1250 bytes
@@ -1910,10 +1910,10 @@
global logging format was statement-based (that is, whenever
<literal role="sysvar">binlog_format</literal> was set to
<literal>STATEMENT</literal>). Beginning with MySQL 5.5.7,
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal> is always handled as a simple
- <literal role="stmt">INSERT</literal> (that is, without the
- <literal>DELAYED</literal> option) whenever the value of
+ <literal role="stmt">INSERT DELAYED</literal> is always
+ handled as a simple <literal role="stmt">INSERT</literal>
+ (that is, without the <literal>DELAYED</literal> option)
+ whenever the value of
<literal role="sysvar">binlog_format</literal> is
<literal>STATEMENT</literal> or <literal>MIXED</literal>.
(In the latter case, the statement no longer triggers a
Modified: trunk/refman-5.6/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-data-manipulation.xml 2010-11-12 02:11:32 UTC (rev 23705)
+++ trunk/refman-5.6/sql-syntax-data-manipulation.xml 2010-11-12 02:11:40 UTC (rev 23706)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 1250 bytes
@@ -1857,10 +1857,10 @@
global logging format was statement-based (that is, whenever
<literal role="sysvar">binlog_format</literal> was set to
<literal>STATEMENT</literal>). Beginning with MySQL 5.6.1,
- <literal role="stmt" condition="insert-delayed">INSERT
- DELAYED</literal> is always handled as a simple
- <literal role="stmt">INSERT</literal> (that is, without the
- <literal>DELAYED</literal> option) whenever the value of
+ <literal role="stmt">INSERT DELAYED</literal> is always
+ handled as a simple <literal role="stmt">INSERT</literal>
+ (that is, without the <literal>DELAYED</literal> option)
+ whenever the value of
<literal role="sysvar">binlog_format</literal> is
<literal>STATEMENT</literal> or <literal>MIXED</literal>.
(In the latter case, the statement no longer triggers a
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r23706 - in trunk: . dynamic-docs/changelog refman-5.5 refman-5.6 | paul.dubois | 12 Nov |
