Author: paul
Date: 2009-01-08 22:12:53 +0100 (Thu, 08 Jan 2009)
New Revision: 13048
Log:
r37084@frost: paul | 2009-01-08 14:37:46 -0500
Minor wording changes
Modified:
trunk/dynamic-docs/changelog/mysqld.xml
trunk/refman-4.1/se-innodb-core.xml
trunk/refman-5.0/se-innodb-core.xml
trunk/refman-5.1/se-innodb-core.xml
trunk/refman-6.0/se-innodb-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:40875
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:37077
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35335
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:40875
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:37084
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35335
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2009-01-08 19:50:30 UTC (rev 13047)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2009-01-08 21:12:53 UTC (rev 13048)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 688 bytes
@@ -137334,7 +137334,8 @@
<literal role="isolevel">READ COMMITTED</literal> isolation
level, <literal role="stmt">UPDATE</literal> statements skipped
rows locked by another transaction, rather than waiting for the
- locks to be released.
+ locks to be released. Consequently, rows that possibly should
+ have been updated were never examined.
</para>
</message>
Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml 2009-01-08 19:50:30 UTC (rev 13047)
+++ trunk/refman-4.1/se-innodb-core.xml 2009-01-08 21:12:53 UTC (rev 13048)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 690 bytes
@@ -5141,8 +5141,8 @@
<listitem>
<para>
<literal>CREATE TABLE ... SELECT ...</literal> performs the
- <literal role="stmt">SELECT</literal> as a consistent read
- or with shared locks, as in the previous item.
+ <literal role="stmt">SELECT</literal> with shared locks or
+ as a consistent read, as in the previous item.
</para>
</listitem>
Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml 2009-01-08 19:50:30 UTC (rev 13047)
+++ trunk/refman-5.0/se-innodb-core.xml 2009-01-08 21:12:53 UTC (rev 13048)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 937 bytes
@@ -1856,7 +1856,7 @@
<programlisting>
x-lock(1,2)
update(1,2) to (1,4); retain x-lock
-x-lock(2,3) - wait for first UPDATE to commit or roll back
+x-lock(2,3); block and wait for first UPDATE to commit or roll back
</programlisting>
<para>
@@ -5202,8 +5202,8 @@
<listitem>
<para>
<literal>CREATE TABLE ... SELECT ...</literal> performs the
- <literal role="stmt">SELECT</literal> as a consistent read
- or with shared locks, as in the previous item.
+ <literal role="stmt">SELECT</literal> with shared locks or
+ as a consistent read, as in the previous item.
</para>
</listitem>
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2009-01-08 19:50:30 UTC (rev 13047)
+++ trunk/refman-5.1/se-innodb-core.xml 2009-01-08 21:12:53 UTC (rev 13048)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 937 bytes
@@ -1897,7 +1897,7 @@
<programlisting>
x-lock(1,2)
update(1,2) to (1,4); retain x-lock
-x-lock(2,3) - wait for first UPDATE to commit or roll back
+x-lock(2,3); block and wait for first UPDATE to commit or roll back
</programlisting>
<para>
@@ -5918,8 +5918,8 @@
<listitem>
<para>
<literal>CREATE TABLE ... SELECT ...</literal> performs the
- <literal role="stmt">SELECT</literal> as a consistent read
- or with shared locks, as in the previous item.
+ <literal role="stmt">SELECT</literal> with shared locks or
+ as a consistent read, as in the previous item.
</para>
</listitem>
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2009-01-08 19:50:30 UTC (rev 13047)
+++ trunk/refman-6.0/se-innodb-core.xml 2009-01-08 21:12:53 UTC (rev 13048)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 937 bytes
@@ -1826,7 +1826,7 @@
<programlisting>
x-lock(1,2)
update(1,2) to (1,4); retain x-lock
-x-lock(2,3) - wait for first UPDATE to commit or roll back
+x-lock(2,3); block and wait for first UPDATE to commit or roll back
</programlisting>
<para>
@@ -5785,8 +5785,8 @@
<listitem>
<para>
<literal>CREATE TABLE ... SELECT ...</literal> performs the
- <literal role="stmt">SELECT</literal> as a consistent read
- or with shared locks, as in the previous item.
+ <literal role="stmt">SELECT</literal> with shared locks or
+ as a consistent read, as in the previous item.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r13048 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 8 Jan |
